chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[svn r15355] Minor - title's encoding fixed

Browse Source
skala
Julio Montoya 18 years ago
parent e538ad192a
commit c13d292e24
1 changed files with 24 additions and 18 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 42
      main/newscorm/learnpath.class.php

42
main/newscorm/learnpath.class.php
Unescape View File

@ -2451,7 +2451,7 @@ class learnpath {
// build, display // build, display
if(api_is_allowed_to_edit()) if(api_is_allowed_to_edit())
{ {
$mych = api_get_setting('platform_charset'); $mych = api_get_setting('platform_charset');
$html.="<p>&nbsp;&nbsp;&nbsp;&nbsp;<a target='_parent' href='lp_controller.php?".api_get_cidreq()."&action=build&lp_id=".$this->lp_id."' style= target='_parent'>".mb_convert_encoding(get_lang("Build"),$this->encoding,$mych)."</a>&nbsp;&#124;&nbsp;<a href='lp_controller.php?".api_get_cidreq()."&action=admin_view&lp_id=".$this->lp_id."' target='_parent'>".mb_convert_encoding(get_lang("BasicOverview"),$this->encoding,$mych)."</a>&nbsp;&#124;&nbsp;".mb_convert_encoding(get_lang("Display"),$this->encoding,$mych)."</p>"; $html.="<p>&nbsp;&nbsp;&nbsp;&nbsp;<a target='_parent' href='lp_controller.php?".api_get_cidreq()."&action=build&lp_id=".$this->lp_id."' style= target='_parent'>".mb_convert_encoding(get_lang("Build"),$this->encoding,$mych)."</a>&nbsp;&#124;&nbsp;<a href='lp_controller.php?".api_get_cidreq()."&action=admin_view&lp_id=".$this->lp_id."' target='_parent'>".mb_convert_encoding(get_lang("BasicOverview"),$this->encoding,$mych)."</a>&nbsp;&#124;&nbsp;".mb_convert_encoding(get_lang("Display"),$this->encoding,$mych)."</p>";
unset($mych); unset($mych);
} }
@ -2518,7 +2518,7 @@ class learnpath {
$title = rl_get_resource_name(api_get_course_id(),$this->get_id(),$item['id']); $title = rl_get_resource_name(api_get_course_id(),$this->get_id(),$item['id']);
} }
$title = html_entity_decode($title,ENT_QUOTES,$this->encoding); $title = html_entity_decode($title,ENT_QUOTES,$this->encoding);
if($item['type']!='dokeos_chapter' and $item['type']!='dir' AND $item['type']!='dokeos_module') if($item['type']!='dokeos_chapter' and $item['type']!='dir' AND $item['type']!='dokeos_module')
{ {
@ -3979,22 +3979,25 @@ 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(
'id' => $row['id'], $arrLP[] = array(
'item_type' => $row['item_type'], 'id' => $row['id'],
'title' => $row['title'], 'item_type' => $row['item_type'],
'description' => $row['description'], 'title' => $row['title'],
'parent_item_id' => $row['parent_item_id'], 'description' => $row['description'],
'previous_item_id' => $row['previous_item_id'], 'parent_item_id' => $row['parent_item_id'],
'next_item_id' => $row['next_item_id'], 'previous_item_id' => $row['previous_item_id'],
'display_order' => $row['display_order']); 'next_item_id' => $row['next_item_id'],
'display_order' => $row['display_order']);
} }
$this->tree_array($arrLP); $this->tree_array($arrLP);
@ -4120,13 +4123,16 @@ class learnpath {
lp_id = " . $this->lp_id; lp_id = " . $this->lp_id;
$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'],

Write Preview
Loading…
Cancel
Save