diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2014-06-17 22:06:56 +0200 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2014-06-18 12:53:20 +0200 |
| commit | 5cae863408630aee768adf70fdb5c11f72b713fa (patch) | |
| tree | 8de499b906379bd25e2e3a23b5a15581523586c9 /lib/private/util.php | |
| parent | 9335a5f07f667ae5c917cc1ee065bceecdb65795 (diff) | |
| download | nextcloud-server-5cae863408630aee768adf70fdb5c11f72b713fa.tar.gz nextcloud-server-5cae863408630aee768adf70fdb5c11f72b713fa.zip | |
change architecture from inheritance to composition
Diffstat (limited to 'lib/private/util.php')
| -rwxr-xr-x | lib/private/util.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/private/util.php b/lib/private/util.php index f2ecdcbded6..d384eda5f7f 100755 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -32,11 +32,17 @@ class OC_Util { private static function initObjectStoreRootFS($config) { // check misconfiguration if (empty($config['class'])) { - //FIXME log error? + \OCP\Util::writeLog('files', 'No class given for objectstore', \OCP\Util::ERROR); } if (!isset($config['arguments'])) { $config['arguments'] = array(); } + + // instantiate object store implementation + $config['arguments']['objectstore'] = new $config['class']($config['arguments']); + // mount with plain / root object store implementation + $config['class'] = '\OC\Files\ObjectStore\ObjectStoreStorage'; + // mount object storage as root \OC\Files\Filesystem::initMounts(); if(!self::$rootMounted) { @@ -94,7 +100,7 @@ class OC_Util { * @var \OC\Files\Storage\Storage $storage */ if ($storage->instanceOfStorage('\OC\Files\Storage\Home') - || $storage->instanceOfStorage('\OC\Files\ObjectStore\AbstractObjectStore') + || $storage->instanceOfStorage('\OC\Files\ObjectStore\HomeObjectStoreStorage') ) { if (is_object($storage->getUser())) { $user = $storage->getUser()->getUID(); |