diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-03-07 21:49:46 +0100 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-03-07 21:49:46 +0100 |
| commit | 9908adb320171c0a12fa7d78964b5ddc3527f9fd (patch) | |
| tree | 06544ba73bced1ddc104cb2bf87e3c7672c026ad /lib/l10n.php | |
| parent | faf6055baa224fbf4248a70d28ae4416c9c7eb1c (diff) | |
| parent | d8cfe77ba5348d29a9e2b046e2c7efc1dd4758cb (diff) | |
| download | nextcloud-server-9908adb320171c0a12fa7d78964b5ddc3527f9fd.tar.gz nextcloud-server-9908adb320171c0a12fa7d78964b5ddc3527f9fd.zip | |
Merge branch 'master' into vcategories
Conflicts:
apps/contacts/lib/vcard.php
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 a5544eb3a27..636326f9864 100644 --- a/lib/l10n.php +++ b/lib/l10n.php @@ -243,8 +243,8 @@ class OC_L10N{ $i18ndir = OC::$SERVERROOT.'/core/l10n/'; if($app != ''){ // Check if the app is in the app folder - if(file_exists(OC::$SERVERROOT.'/apps/'.$app.'/l10n/')){ - $i18ndir = OC::$SERVERROOT.'/apps/'.$app.'/l10n/'; + if(file_exists(OC::$APPSROOT.'/apps/'.$app.'/l10n/')){ + $i18ndir = OC::$APPSROOT.'/apps/'.$app.'/l10n/'; } else{ $i18ndir = OC::$SERVERROOT.'/'.$app.'/l10n/'; |