Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin McCorkell <rmccorkell@owncloud.com>2015-09-16 12:47:46 +0300
committerRobin McCorkell <rmccorkell@owncloud.com>2015-09-16 12:48:03 +0300
commit862afd80b36b64262dcce03f15886d81b88080ae (patch)
tree1348fb27121320b69f3948535591cd1c02c2e7a4 /lib/private/app.php
parent41e79675c3f2409df13a2b06f0ad9d55fa0ec5ad (diff)
Restore loadApp() autoload registration
Also changes the autoloader validRoots into a hashmap to try and reduce duplicate entries
Diffstat (limited to 'lib/private/app.php')
-rw-r--r--lib/private/app.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/private/app.php b/lib/private/app.php
index e42fba525e4..368b3220b49 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -131,6 +131,7 @@ class OC_App {
*/
public static function loadApp($app, $checkUpgrade = true) {
self::$loadedApps[] = $app;
+ \OC::$loader->addValidRoot(self::getAppPath($app)); // in case someone calls loadApp() directly
if (is_file(self::getAppPath($app) . '/appinfo/app.php')) {
\OC::$server->getEventLogger()->start('load_app_' . $app, 'Load app: ' . $app);
if ($checkUpgrade and self::shouldUpgrade($app)) {