Browse Source

[svn r13266] Changed location of $charset var setting to override the one existing in trad4all.inc.php

Yannick Warnier 17 years ago
parent
commit
20eb7eed37
1 changed files with 3 additions and 1 deletions
  1. 3 1
      main/inc/global.inc.php

+ 3 - 1
main/inc/global.inc.php

@@ -152,7 +152,6 @@ while ($row=mysql_fetch_array($result))
 }
 
 
-$charset = api_get_setting('platform_charset');
 // include the local (contextual) parameters of this course or section
 require($includePath."/local.inc.php");
 
@@ -334,6 +333,9 @@ foreach($language_files as $index => $language_file)
 	include(api_get_path(SYS_CODE_PATH).'lang/'.$language_interface.'/'.$language_file.'.inc.php');
 }
 
+//load the charset param after langs because the $charset variable in 
+//trad4all.inc.php might have set it and we don't want that
+$charset = api_get_setting('platform_charset');
 
 //Update of the logout_date field in the table track_e_login (needed for the calculation of the total connection time)