aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/private/legacy/OC_App.php9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/private/legacy/OC_App.php b/lib/private/legacy/OC_App.php
index 941cd25397d..34d5d9ffe7c 100644
--- a/lib/private/legacy/OC_App.php
+++ b/lib/private/legacy/OC_App.php
@@ -118,9 +118,12 @@ class OC_App {
// Add each apps' folder as allowed class path
foreach ($apps as $app) {
- $path = self::getAppPath($app);
- if ($path !== false) {
- self::registerAutoloading($app, $path);
+ // If the app is already loaded then autoloading it makes no sense
+ if (!isset(self::$loadedApps[$app])) {
+ $path = self::getAppPath($app);
+ if ($path !== false) {
+ self::registerAutoloading($app, $path);
+ }
}
}