diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-21 09:51:51 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-02-21 09:51:51 +0100 |
| commit | f19276f7bc5fa74dff749112fffd350dad662148 (patch) | |
| tree | cf0ff38b4f42f4a0272b402a07f3fd91c7cd4c69 /lib/private/files/filesystem.php | |
| parent | fbea02bebb561f7a76a876065066c9face6e484e (diff) | |
| parent | fe24aafe7d55044e8e03a6ca2fc116174966951e (diff) | |
| download | nextcloud-server-f19276f7bc5fa74dff749112fffd350dad662148.tar.gz nextcloud-server-f19276f7bc5fa74dff749112fffd350dad662148.zip | |
Merge branch 'master' into no-css-js-delivery-via-php
Conflicts:
config/config.sample.php
Diffstat (limited to 'lib/private/files/filesystem.php')
| -rw-r--r-- | lib/private/files/filesystem.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php index b6102f5c245..952f9f9febf 100644 --- a/lib/private/files/filesystem.php +++ b/lib/private/files/filesystem.php @@ -320,16 +320,16 @@ class Filesystem { else { self::mount('\OC\Files\Storage\Local', array('datadir' => $root), $user); } - $datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data"); + $mount_file = \OC_Config::getValue("mount_file", \OC::$SERVERROOT . "/data/mount.json"); //move config file to it's new position if (is_file(\OC::$SERVERROOT . '/config/mount.json')) { - rename(\OC::$SERVERROOT . '/config/mount.json', $datadir . '/mount.json'); + rename(\OC::$SERVERROOT . '/config/mount.json', $mount_file); } // Load system mount points - if (is_file(\OC::$SERVERROOT . '/config/mount.php') or is_file($datadir . '/mount.json')) { - if (is_file($datadir . '/mount.json')) { - $mountConfig = json_decode(file_get_contents($datadir . '/mount.json'), true); + if (is_file(\OC::$SERVERROOT . '/config/mount.php') or is_file($mount_file)) { + if (is_file($mount_file)) { + $mountConfig = json_decode(file_get_contents($mount_file), true); } elseif (is_file(\OC::$SERVERROOT . '/config/mount.php')) { $mountConfig = $parser->parsePHP(file_get_contents(\OC::$SERVERROOT . '/config/mount.php')); } |