From: Lukas Reschke <lukas@statuscode.ch>
Date: Mon, 2 Jul 2012 08:29:04 +0000 (+0200)
Subject: Applying the fix
X-Git-Tag: v4.0.5~42
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e29681e233c46080cb7aebf59bfbb8134d631e4a;p=nextcloud-server.git

Applying the fix
---

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)){