diff --git a/main/inc/global.inc.php b/main/inc/global.inc.php index ad70597a27..e1f5872f88 100644 --- a/main/inc/global.inc.php +++ b/main/inc/global.inc.php @@ -390,10 +390,11 @@ if( isset($language_file) ) } } // Include all files (first english and then current interface language) +$langpath = api_get_path(SYS_CODE_PATH).'lang/'; foreach($language_files as $index => $language_file) { - include(api_get_path(SYS_CODE_PATH).'lang/english/'.$language_file.'.inc.php'); - include(api_get_path(SYS_CODE_PATH).'lang/'.$language_interface.'/'.$language_file.'.inc.php'); + include($langpath.'english/'.$language_file.'.inc.php'); + include($langpath.$language_interface.'/'.$language_file.'.inc.php'); } //load the charset param after langs because the $charset variable in diff --git a/main/inc/lib/main_api.lib.php b/main/inc/lib/main_api.lib.php index ad1921592c..ccd8192d12 100644 --- a/main/inc/lib/main_api.lib.php +++ b/main/inc/lib/main_api.lib.php @@ -1173,17 +1173,18 @@ function get_lang($variable, $notrans = 'DLTT') return $ot.'get_lang(?)'.$ct; global $language_interface, $language_files; //language file specified in tool + $langpath = api_get_path(SYS_CODE_PATH).'lang/'; if (isset ($language_files)) { if (!is_array($language_files)) { - include (api_get_path(SYS_CODE_PATH)."lang/".$language_interface."/".$language_files.".inc.php"); + @include ($langpath.$language_interface.'/'.$language_files.'.inc.php'); } else { foreach ($language_files as $index => $language_file) { - include (api_get_path(SYS_CODE_PATH)."lang/".$language_interface."/".$language_file.".inc.php"); + @include ($langpath.$language_interface.'/'.$language_file.'.inc.php'); } } }