RetailCRM-Mirror/bitrix-module
1
0
Fork 0
mirror of synced 2024-11-22 21:36:10 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:intarocrm/bitrix-module

Browse Source
This commit is contained in:
Grisha Pomadchin 2013-11-09 01:12:44 +04:00
commit f22f5d310c
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
intaro.intarocrm/classes/general/ICMLLoader.php
View File

@ -11,6 +11,7 @@ class ICMLLoader {
public $propertiesProduct; public $propertiesProduct;
public $application; public $application;
public $encoding = 'utf-8'; public $encoding = 'utf-8';
public $defaultCharset = null;
protected $fp; protected $fp;
protected $mainSection = 1000000; protected $mainSection = 1000000;
@ -28,6 +29,8 @@ class ICMLLoader {
$this->isLogged = true; $this->isLogged = true;
$this->defaultCharset = LANG_CHARSET;
$this->PrepareSettings(); $this->PrepareSettings();
@ -80,7 +83,10 @@ class ICMLLoader {
protected function PrepareValue($text) protected function PrepareValue($text)
{ {
$newText = $this->application->ConvertCharset($text, LANG_CHARSET, $this->encoding); if ($this->defaultCharset === "")
$this->defaultCharset = mb_detect_encoding($text);
$newText = $this->application->ConvertCharset($text, $this->defaultCharset, $this->encoding);
$newText = strip_tags($newText); $newText = strip_tags($newText);
$newText = str_replace("&", "&", $newText); $newText = str_replace("&", "&", $newText);
return $newText; return $newText;