Static method getInstance() conflicts with getInstance() in class BaseRegistry,

[core.git] / inc / classes / main / language / class_LanguageSystem.php

diff --git a/inc/classes/main/language/class_LanguageSystem.php b/inc/classes/main/language/class_LanguageSystem.php
index df1fe429001379ecba87afbac262aa317ae18bac..3cde53082b6dd0c129efdb0debd6c4d2797658a5 100644 (file)
--- a/inc/classes/main/language/class_LanguageSystem.php
+++ b/inc/classes/main/language/class_LanguageSystem.php
@@ -91,7 +91,7 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage,
                $langInstance->initLanguageStrings();
 
                // Set language code from default config
-               $langInstance->setLanguageCode(FrameworkConfiguration::getInstance()->getConfigEntry('default_lang'));
+               $langInstance->setLanguageCode(FrameworkConfiguration::getSelfInstance()->getConfigEntry('default_lang'));
 
                // Remember this instance
                self::$thisInstance = $langInstance;
@@ -105,7 +105,7 @@ class LanguageSystem extends BaseFrameworkSystem implements ManageableLanguage,
         *
         * @return      $thisInstance   An instance of this class
         */
-       public static final function getInstance () {
+       public static final function getSelfInstance () {
                return self::$thisInstance;
        }