diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-07 13:47:33 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-07 13:47:33 +0100 |
| commit | f0afbffaef1bd08eff55ba2c2071ab05d619b043 (patch) | |
| tree | af949d0c64100664e183d241bbccfa8bc3eedd91 | |
| parent | b9e724d4ae7635435b3cc7793237c3ab9fe2a1c0 (diff) | |
| parent | 229f13adc0eca770c07646e56773f1aa93fee643 (diff) | |
| download | nextcloud-server-f0afbffaef1bd08eff55ba2c2071ab05d619b043.tar.gz nextcloud-server-f0afbffaef1bd08eff55ba2c2071ab05d619b043.zip | |
Merge pull request #6997 from owncloud/fix_l10n_warnings
change order of issubdirectory() calls to avoid error messages for non-apps
| -rw-r--r-- | lib/private/l10n.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/l10n.php b/lib/private/l10n.php index 98665c84c55..1aa1dc5ea28 100644 --- a/lib/private/l10n.php +++ b/lib/private/l10n.php @@ -132,10 +132,10 @@ class OC_L10N implements \OCP\IL10N { $i18ndir = self::findI18nDir($app); // Localization is in /l10n, Texts are in $i18ndir // (Just no need to define date/time format etc. twice) - if((OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC_App::getAppPath($app).'/l10n/') - || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/core/l10n/') + if((OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/core/l10n/') || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/lib/l10n/') || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/settings') + || OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC_App::getAppPath($app).'/l10n/') ) && file_exists($i18ndir.$lang.'.php')) { // Include the file, save the data from $CONFIG |