diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2014-02-20 18:34:27 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2014-02-20 18:34:27 +0100 |
| commit | 6cb64a4fced31906938159eb237159cac815ca26 (patch) | |
| tree | 023fb8f320f4fcf8c7327d387e5812c0865866ff /apps/files_external/lib | |
| parent | ec45a3c0e2567c89729bc6fe8c996b7939025429 (diff) | |
| download | nextcloud-server-6cb64a4fced31906938159eb237159cac815ca26.tar.gz nextcloud-server-6cb64a4fced31906938159eb237159cac815ca26.zip | |
Fix code to search for mount.json in custom data folders
Diffstat (limited to 'apps/files_external/lib')
| -rwxr-xr-x | apps/files_external/lib/config.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php index b2109e5eacd..ed9a0126dd1 100755 --- a/apps/files_external/lib/config.php +++ b/apps/files_external/lib/config.php @@ -353,7 +353,8 @@ class OC_Mount_Config { $jsonFile = OC_User::getHome(OCP\User::getUser()).'/mount.json'; } else { $phpFile = OC::$SERVERROOT.'/config/mount.php'; - $jsonFile = \OC_Config::getValue("mount_file", \OC::$SERVERROOT . "/data/mount.json"); + $datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data/"); + $jsonFile = \OC_Config::getValue("mount_file", $datadir . "/mount.json"); } if (is_file($jsonFile)) { $mountPoints = json_decode(file_get_contents($jsonFile), true); |