summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2016-11-14 16:44:16 +0100
committerGitHub <noreply@github.com>2016-11-14 16:44:16 +0100
commit1e3d80641605515d2a9dbf81f7e0360e869e0b88 (patch)
tree2c09d6749537553d9be3392b1bda7c4f171fa513
parent04f8521b2c70abd22e617224ff7a0119e31183c7 (diff)
parent895b638a2cca82f24519f8e2351be992a911d757 (diff)
downloadnextcloud-server-1e3d80641605515d2a9dbf81f7e0360e869e0b88.tar.gz
nextcloud-server-1e3d80641605515d2a9dbf81f7e0360e869e0b88.zip
Merge pull request #2113 from nextcloud/downstream-26299
We need to ensure that the app holding the objectstore implementation…
-rw-r--r--lib/private/legacy/util.php5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/private/legacy/util.php b/lib/private/legacy/util.php
index 5cd92eaa415..ecc8f053704 100644
--- a/lib/private/legacy/util.php
+++ b/lib/private/legacy/util.php
@@ -98,6 +98,11 @@ class OC_Util {
}
// instantiate object store implementation
+ $name = $config['class'];
+ if (strpos($name, 'OCA\\') === 0 && substr_count($name, '\\') >= 2) {
+ $segments = explode('\\', $name);
+ OC_App::loadApp(strtolower($segments[1]));
+ }
$config['arguments']['objectstore'] = new $config['class']($config['arguments']);
// mount with plain / root object store implementation
$config['class'] = '\OC\Files\ObjectStore\ObjectStoreStorage';