Changeset 20325 for trunk/include/functions.inc.php

Timestamp:

Jan 22, 2013, 4:12:48 PM (12 years ago)

Author:

mistic100

Message:

feature:2823 Add triggers for login system, load function_plugins before function_user

File:

• trunk/include/functions.inc.php (modified) (5 diffs)

trunk/include/functions.inc.php

@@ -22 +22 @@
 // +-----------------------------------------------------------------------+
 
+include_once( PHPWG_ROOT_PATH .'include/functions_plugins.inc.php' );
 include_once( PHPWG_ROOT_PATH .'include/functions_user.inc.php' );
 include_once( PHPWG_ROOT_PATH .'include/functions_cookie.inc.php' );
@@ -29 +30 @@
 include_once( PHPWG_ROOT_PATH .'include/functions_tag.inc.php' );
 include_once( PHPWG_ROOT_PATH .'include/functions_url.inc.php' );
-include_once( PHPWG_ROOT_PATH .'include/functions_plugins.inc.php' );
 include_once( PHPWG_ROOT_PATH .'include/derivative_params.inc.php');
 include_once( PHPWG_ROOT_PATH .'include/derivative_std_params.inc.php');
@@ -1257 +1257 @@
   }
   $target_charset = strtolower($target_charset);*/
-  $source_file    = '';
+  $source_file       = '';
+  $selected_language = '';
   foreach ($languages as $language)
   {
@@ -1266 +1267 @@
     if (file_exists($f))
     {
+      $selected_language = $language;
       $source_file = $f;
       break;
@@ -1282 +1284 @@
       if ( !isset($lang) ) $lang=array();
       if ( !isset($lang_info) ) $lang_info=array();
+      
+      $parent_language = !empty($load_lang_info['parent']) ? $load_lang_info['parent'] : (
+                            !empty($lang_info['parent']) ? $lang_info['parent'] : null );
+      if (!empty($parent_language))
+      {
+        @include(str_replace($selected_language, $parent_language, $source_file));
+      }
 
       /* Note: target charset is always utf-8