Changeset 23823 for trunk/include

Timestamp:

Jul 7, 2013, 2:54:44 PM (11 years ago)

Author:

mistic100

Message:

bug:2939 switch_lang_to() must reload plugins files

Location:

trunk/include

Files:

• functions.inc.php (modified) (1 diff)
• functions_mail.inc.php (modified) (2 diffs)

trunk/include/functions.inc.php

@@ -1210 +1210 @@
     $options = array() )
 {
-  global $user;
+  global $user, $language_files;
+  
+  if ( !empty($dirname) and !empty($filename) )
+  {
+    if ( empty($language_files[$dirname]) or !in_array($filename,$language_files[$dirname]) )
+    {
+      $language_files[$dirname][] = $filename;
+    }
+  }
 
   if (! @$options['return'] )

trunk/include/functions_mail.inc.php

@@ -193 +193 @@
 function switch_lang_to($language)
 {
-  global $switch_lang, $user, $lang, $lang_info;
+  global $switch_lang, $user, $lang, $lang_info, $language_files;
 
   // explanation of switch_lang
@@ -225 +225 @@
     // Translations are in admin file too
     load_language('admin.lang', '', array('language'=>$language) );
+    
+    if (!empty($language_files))
+    {
+      foreach ($language_files as $dirname => $files)
+        foreach ($files as $filename)
+          load_language($filename, $dirname, array('language'=>$language) );
+    }
+    
     trigger_action('loading_lang');
     load_language('lang', PHPWG_ROOT_PATH.PWG_LOCAL_DIR,