Changeset 15818 for trunk/inc

Timestamp:

01/01/12 21:42:31 (5 months ago)

Author:

Anton Lesnikov

Message:

1. Improvements in language recompilation.
2. Improvements in Studio -> Menu Builder

File:

• trunk/inc/classes/BxDolLanguages.php (modified) (2 diffs)

trunk/inc/classes/BxDolLanguages.php

@@ -40 +40 @@
             bx_import('BxTemplLanguages');
             $GLOBALS['bxDolClasses'][__CLASS__] = new BxTemplLanguages();
-
-            /**
-             * Trying to initialize default language.
-             */
-            $GLOBALS['sCurrentLanguage'] = $GLOBALS['bxDolClasses'][__CLASS__]->getCurrentLangName(false);
-            if($GLOBALS['sCurrentLanguage'] != '') {
-                $sPath = BX_DIRECTORY_PATH_ROOT . 'langs/lang-' . $GLOBALS['sCurrentLanguage'] . '.php';
-                if(file_exists($sPath))
-                    require_once($sPath);
-            }
-
-            $GLOBALS['bxDolClasses'][__CLASS__]->getCurrentLangName(true);
-            if(isset($_GET['lang'])) {
-                bx_import('BxDolPermalinks');
-                if(BxDolPermalinks::getInstance()->redirectIfNecessary(array('lang')))
-                    exit;
-            }
+            $GLOBALS['bxDolClasses'][__CLASS__]->init();
         }
 
@@ -166 +150 @@
     }
 
+    protected function init() {
+        /**
+         * Trying to initialize default language.
+         */
+        $GLOBALS['sCurrentLanguage'] = $GLOBALS['bxDolClasses'][__CLASS__]->getCurrentLangName(false);
+        if($GLOBALS['sCurrentLanguage'] != '') {
+            $sPath = BX_DIRECTORY_PATH_ROOT . 'langs/lang-' . $GLOBALS['sCurrentLanguage'] . '.php';
+            if(file_exists($sPath))
+                require($sPath);
+        }
+
+        $GLOBALS['bxDolClasses'][__CLASS__]->getCurrentLangName(true);
+        if(isset($_GET['lang'])) {
+            bx_import('BxDolPermalinks');
+            if(BxDolPermalinks::getInstance()->redirectIfNecessary(array('lang')))
+                exit;
+        }
+    }
+
     protected function tryToGetLang($sLangs, $bSetCookie = false) {
         $sLangs = trim($sLangs);