From c16fd29f2924cd9fbd46b4d3f2e4505a55a3b57d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue, 11 Aug 2015 14:19:59 +0200
Subject: [PATCH] Revert "Only load app routes if the app has already been
loaded"
This reverts commit 50ebea41f60f2864a565ea9985c5462c2df5f09e.
---
lib/private/app.php | 10 ----------
lib/private/route/router.php | 6 ------
2 files changed, 16 deletions(-)
diff --git a/lib/private/app.php b/lib/private/app.php
index e51fe73cb1..74b21b2b10 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -73,16 +73,6 @@ class OC_App {
return str_replace(array('\0', '/', '\\', '..'), '', $app);
}
- /**
- * Check if an app is loaded
- *
- * @param string $app
- * @return bool
- */
- public static function isAppLoaded($app) {
- return in_array($app, self::$loadedApps, true);
- }
-
/**
* loads all apps
*
diff --git a/lib/private/route/router.php b/lib/private/route/router.php
index 33669452f2..4899236609 100644
--- a/lib/private/route/router.php
+++ b/lib/private/route/router.php
@@ -150,12 +150,6 @@ class Router implements IRouter {
\OC::$server->getEventLogger()->start('loadroutes' . $requestedApp, 'Loading Routes');
foreach ($routingFiles as $app => $file) {
if (!isset($this->loadedApps[$app])) {
- if (!\OC_App::isAppLoaded($app)) {
- // app MUST be loaded before app routes
- // try again next time loadRoutes() is called
- $this->loaded = false;
- continue;
- }
$this->loadedApps[$app] = true;
$this->useCollection($app);
$this->requireRouteFile($file, $app);
--
GitLab