From e29681e233c46080cb7aebf59bfbb8134d631e4a Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Mon, 2 Jul 2012 10:29:04 +0200 Subject: Applying the fix --- lib/l10n.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/l10n.php') diff --git a/lib/l10n.php b/lib/l10n.php index c0ecdbd1b70..1b761c47d55 100644 --- 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)){ -- cgit v1.2.3