|
|
|
@ -3979,13 +3979,16 @@ class learnpath { |
|
|
|
|
|
|
|
|
|
|
|
$result = api_sql_query($sql, __FILE__, __LINE__); |
|
|
|
$result = api_sql_query($sql, __FILE__, __LINE__); |
|
|
|
$arrLP = array(); |
|
|
|
$arrLP = array(); |
|
|
|
|
|
|
|
$mycharset=api_get_setting('platform_charset'); |
|
|
|
|
|
|
|
|
|
|
|
while($row = Database::fetch_array($result)) |
|
|
|
while($row = Database::fetch_array($result)) |
|
|
|
{ |
|
|
|
{ |
|
|
|
if($this->encoding=='UTF-8') |
|
|
|
|
|
|
|
|
|
|
|
if($this->encoding!=$mycharset) |
|
|
|
{ |
|
|
|
{ |
|
|
|
$row['title'] = utf8_decode($row['title']); |
|
|
|
$row['title'] = mb_convert_encoding($row['title'], $mycharset,$this->encoding); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
$arrLP[] = array( |
|
|
|
$arrLP[] = array( |
|
|
|
'id' => $row['id'], |
|
|
|
'id' => $row['id'], |
|
|
|
'item_type' => $row['item_type'], |
|
|
|
'item_type' => $row['item_type'], |
|
|
|
@ -4121,11 +4124,14 @@ class learnpath { |
|
|
|
|
|
|
|
|
|
|
|
$result = api_sql_query($sql, __FILE__, __LINE__); |
|
|
|
$result = api_sql_query($sql, __FILE__, __LINE__); |
|
|
|
$arrLP = array(); |
|
|
|
$arrLP = array(); |
|
|
|
|
|
|
|
$mycharset=api_get_setting('platform_charset'); |
|
|
|
|
|
|
|
|
|
|
|
while($row = Database::fetch_array($result)) |
|
|
|
while($row = Database::fetch_array($result)) |
|
|
|
{ |
|
|
|
{ |
|
|
|
if($this->encoding=='UTF-8') |
|
|
|
|
|
|
|
|
|
|
|
if($this->encoding!=$mycharset) |
|
|
|
{ |
|
|
|
{ |
|
|
|
$row['title'] = utf8_decode($row['title']); |
|
|
|
$row['title'] = mb_convert_encoding($row['title'], $mycharset,$this->encoding); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
$arrLP[] = array( |
|
|
|
$arrLP[] = array( |
|
|
|
|