summaryrefslogtreecommitdiffstats
path: root/lib/private/l10n.php
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2014-05-11 15:50:59 +0200
committerLukas Reschke <lukas@statuscode.ch>2014-05-11 15:50:59 +0200
commitfd5b2d11d6a174f46df563917060e350f6df079a (patch)
tree9b01c11680bb6cff5ec255c15dc723b4b2a9f72d /lib/private/l10n.php
parenta40e49cae5983d8158562e142919cd3108bd2fd8 (diff)
downloadnextcloud-server-fd5b2d11d6a174f46df563917060e350f6df079a.tar.gz
nextcloud-server-fd5b2d11d6a174f46df563917060e350f6df079a.zip
Rename issubdirectory to isSubDirectory
Diffstat (limited to 'lib/private/l10n.php')
-rw-r--r--lib/private/l10n.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/private/l10n.php b/lib/private/l10n.php
index d6680d63445..c1596a64163 100644
--- a/lib/private/l10n.php
+++ b/lib/private/l10n.php
@@ -134,10 +134,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::$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/')
+ 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
@@ -162,7 +162,7 @@ class OC_L10N implements \OCP\IL10N {
}
}
- if(file_exists(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php') && OC_Helper::issubdirectory(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php', OC::$SERVERROOT.'/core/l10n/')) {
+ if(file_exists(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php') && OC_Helper::isSubDirectory(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php', OC::$SERVERROOT.'/core/l10n/')) {
// Include the file, save the data from $CONFIG
include OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php';
if(isset($LOCALIZATIONS) && is_array($LOCALIZATIONS)) {