diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2020-11-06 21:58:44 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-06 21:58:44 +0100 |
| commit | b70cf435a753331bf6365f13e10a13a953b1b147 (patch) | |
| tree | 4f91300348d533e5b9b9cabe138412a516cdde36 /lib/private/legacy | |
| parent | c27223f747dd94ba9cf6ced5033739ad7d6b4a83 (diff) | |
| parent | 0dece786172f7d0ee343c4d92343341378fb9031 (diff) | |
| download | nextcloud-server-b70cf435a753331bf6365f13e10a13a953b1b147.tar.gz nextcloud-server-b70cf435a753331bf6365f13e10a13a953b1b147.zip | |
Merge pull request #23940 from nextcloud/enh/skip_already_loaded_apps
Skip already loaded apps in loadApps
Diffstat (limited to 'lib/private/legacy')
| -rw-r--r-- | lib/private/legacy/OC_App.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/legacy/OC_App.php b/lib/private/legacy/OC_App.php index d2f8e536005..941cd25397d 100644 --- a/lib/private/legacy/OC_App.php +++ b/lib/private/legacy/OC_App.php @@ -94,7 +94,7 @@ class OC_App { * @return bool */ public static function isAppLoaded(string $app): bool { - return in_array($app, self::$loadedApps, true); + return isset(self::$loadedApps[$app]); } /** @@ -127,7 +127,7 @@ class OC_App { // prevent app.php from printing output ob_start(); foreach ($apps as $app) { - if (($types === [] or self::isType($app, $types)) && !in_array($app, self::$loadedApps)) { + if (!isset(self::$loadedApps[$app]) && ($types === [] || self::isType($app, $types))) { self::loadApp($app); } } @@ -143,7 +143,7 @@ class OC_App { * @throws Exception */ public static function loadApp(string $app) { - self::$loadedApps[] = $app; + self::$loadedApps[$app] = true; $appPath = self::getAppPath($app); if ($appPath === false) { return; |