Applying the fix

diff --git a/lib/l10n.php b/lib/l10n.php
index c0ecdbd1b705dd061d3c454e8327b62600649a83..1b761c47d55cf9823c907eb03fe38c653238c8f6 100644 (file)
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -100,7 +100,7 @@ class OC_L10N{
                                }
                        }
 
-                       if(file_exists(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php')){
+                       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')) {
                                // Include the file, save the data from $CONFIG
                                include(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php');
                                if(isset($LOCALIZATIONS) && is_array($LOCALIZATIONS)){