diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2012-07-02 10:21:38 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2012-07-02 10:24:22 +0200 |
| commit | f8cebed3481d523ff43d438ac97048137f4f9902 (patch) | |
| tree | e9b6fd31827e34d08ea2a714e3f443810222f52d /lib/l10n.php | |
| parent | e4960c3bb471d572e6883eb8c5a503e3e7c6ccba (diff) | |
| download | nextcloud-server-f8cebed3481d523ff43d438ac97048137f4f9902.tar.gz nextcloud-server-f8cebed3481d523ff43d438ac97048137f4f9902.zip | |
Don't display error messages
Diffstat (limited to 'lib/l10n.php')
| -rw-r--r-- | lib/l10n.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/l10n.php b/lib/l10n.php index b21829e91fd..de8514573d3 100644 --- a/lib/l10n.php +++ b/lib/l10n.php @@ -113,13 +113,13 @@ class OC_L10N{ $i18ndir = self::findI18nDir($app); // Localization is in /l10n, Texts are in $i18ndir // (Just no need to define date/time format etc. twice) - if(file_exists($i18ndir.$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(strip_tags($i18ndir).strip_tags($lang).'.php'); if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)){ $this->translations = $TRANSLATIONS; } - } + } if(file_exists(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php')){ // Include the file, save the data from $CONFIG |