Restoring stable4...

diff --git a/lib/l10n.php b/lib/l10n.php
index 1b761c47d55cf9823c907eb03fe38c653238c8f6..d47637d23ded3edb2fe587d2a7ea19a13ba273ab 100644 (file)
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -92,7 +92,7 @@ class OC_L10N{
                        $i18ndir = self::findI18nDir($app);
                        // Localization is in /l10n, Texts are in $i18ndir
                        // (Just no need to define date/time format etc. twice)
-                       if(file_exists($i18ndir.$lang.'.php')){
+                       if((OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$APPSROOT."/apps") || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/core/l10n/') || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/settings')) && file_exists($i18ndir.$lang.'.php')) {
                                // Include the file, save the data from $CONFIG
                                include($i18ndir.$lang.'.php');
                                if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)){
@@ -100,7 +100,7 @@ class OC_L10N{
                                }
                        }
 
-                       if((OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC_App::getAppPath($app).'/l10n/') || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/core/l10n/') || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/settings')) && file_exists($i18ndir.$lang.'.php')) {
+                       if(file_exists(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php')){
                                // Include the file, save the data from $CONFIG
                                include(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php');
                                if(isset($LOCALIZATIONS) && is_array($LOCALIZATIONS)){