[svn r15355] Minor - title's encoding fixed

main/newscorm/learnpath.class.php

@@ -3979,22 +3979,25 @@ class learnpath {
 		
 		$result = api_sql_query($sql, __FILE__, __LINE__);		
 		$arrLP = array();		
+		$mycharset=api_get_setting('platform_charset');		
 		
 		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'],
-				'item_type' => $row['item_type'],
-				'title' => $row['title'],
-				'description' => $row['description'],
-				'parent_item_id' => $row['parent_item_id'],
-				'previous_item_id' => $row['previous_item_id'],
-				'next_item_id' => $row['next_item_id'],
-				'display_order' => $row['display_order']);		
+			
+			$arrLP[] = array(
+			'id' => $row['id'],
+			'item_type' => $row['item_type'],
+			'title' => $row['title'],
+			'description' => $row['description'],
+			'parent_item_id' => $row['parent_item_id'],
+			'previous_item_id' => $row['previous_item_id'],
+			'next_item_id' => $row['next_item_id'],
+			'display_order' => $row['display_order']);		
 		}
 		 
 		$this->tree_array($arrLP);		
@@ -4121,11 +4124,14 @@ class learnpath {
 		
 		$result = api_sql_query($sql, __FILE__, __LINE__);		
 		$arrLP = array();	
+		$mycharset=api_get_setting('platform_charset');		
+				
 		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(