only use one config option 'objectstore' for root and home storage configuration

diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php
index f5a7060ec9098241e1f0df6ca3d5702f417b0dbc..71d70bbf2a56e20fd1932a9fd5f6dcd3babf9b30 100644 (file)
--- a/lib/private/files/filesystem.php
+++ b/lib/private/files/filesystem.php
@@ -325,14 +325,14 @@ class Filesystem {
                $userObject = \OC_User::getManager()->get($user);
 
                if (!is_null($userObject)) {
-                       $homeStorage = \OC_Config::getValue( 'home_storage', array(
+                       $homeStorage = \OC_Config::getValue( 'objectstore', array(
                                //default home storage configuration:
                                'class' => '\OC\Files\Storage\Home',
                                'arguments' => array()
                        ));
                        // sanity checks
                        if (empty($homeStorage['class'])) {
-                               \OCP\Util::writeLog('files', 'No class given for home_storage', \OCP\Util::ERROR);
+                               \OCP\Util::writeLog('files', 'No class given for objectstore', \OCP\Util::ERROR);
                        }
                        if (!isset($homeStorage['arguments'])) {
                                $homeStorage['arguments'] = array();

diff --git a/lib/private/util.php b/lib/private/util.php
index b4772f149604263f625fa86a9b84e9eaf5f4a188..f2ecdcbded6a3994d17245d038ff4d28618e6b9d 100755 (executable)
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -73,9 +73,9 @@ class OC_Util {
                }
 
                //check if we are using an object storage
-               $root_storage = OC_Config::getValue( 'root_storage' );
-               if ( isset( $root_storage ) ) {
-                       self::initObjectStoreRootFS($root_storage);
+               $objectStore = OC_Config::getValue( 'objectstore' );
+               if ( isset( $objectStore ) ) {
+                       self::initObjectStoreRootFS($objectStore);
                } else {
                        self::initLocalStorageRootFS();
                }
@@ -108,10 +108,8 @@ class OC_Util {
                                return $storage;
                        });
 
-                       $userDir = '/'.$user.'/files';
-
                        // copy skeleton for local storage only
-                       if ( ! isset( $root_storage ) ) {
+                       if ( ! isset( $objectStore ) ) {
                                $userRoot = OC_User::getHome($user);
                                $userDirectory = $userRoot . '/files';
                                if( !is_dir( $userDirectory )) {
@@ -120,6 +118,8 @@ class OC_Util {
                                }
                        }
 
+                       $userDir = '/'.$user.'/files';
+
                        //jail the user into his "home" directory
                        \OC\Files\Filesystem::init($user, $userDir);