Merge pull request #6997 from owncloud/fix_l10n_warnings
change order of issubdirectory() calls to avoid error messages for non-apps
This commit is contained in:
commit
f0afbffaef
|
@ -132,10 +132,10 @@ class OC_L10N implements \OCP\IL10N {
|
||||||
$i18ndir = self::findI18nDir($app);
|
$i18ndir = self::findI18nDir($app);
|
||||||
// Localization is in /l10n, Texts are in $i18ndir
|
// Localization is in /l10n, Texts are in $i18ndir
|
||||||
// (Just no need to define date/time format etc. twice)
|
// (Just no need to define date/time format etc. twice)
|
||||||
if((OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC_App::getAppPath($app).'/l10n/')
|
if((OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/core/l10n/')
|
||||||
|| 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.'/lib/l10n/')
|
||||||
|| OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/settings')
|
|| 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')) {
|
&& file_exists($i18ndir.$lang.'.php')) {
|
||||||
// Include the file, save the data from $CONFIG
|
// Include the file, save the data from $CONFIG
|
||||||
|
|
Loading…
Reference in New Issue