diff options
| author | icewind1991 <robin@icewind.nl> | 2014-01-31 08:47:19 -0800 |
|---|---|---|
| committer | icewind1991 <robin@icewind.nl> | 2014-01-31 08:47:19 -0800 |
| commit | cf6538abdeb1a89ee020ded19a9711ea1f013327 (patch) | |
| tree | 27955609109eb477cc3afe2b21e8f451588248ae | |
| parent | 1f30bffba3529c2f5e5be75426392d2b0a4cb46f (diff) | |
| parent | 0d9fe770f36c9aac53c41a6c8430bb68751937bb (diff) | |
| download | nextcloud-server-cf6538abdeb1a89ee020ded19a9711ea1f013327.tar.gz nextcloud-server-cf6538abdeb1a89ee020ded19a9711ea1f013327.zip | |
Merge pull request #7025 from owncloud/prevent-double-app-load
Mark an app as loaded before we start loading it
| -rw-r--r-- | lib/private/app.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/app.php b/lib/private/app.php index 0c60557914a..da09021cf3f 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -63,8 +63,8 @@ class OC_App{ ob_start(); foreach( $apps as $app ) { if((is_null($types) or self::isType($app, $types)) && !in_array($app, self::$loadedApps)) { - self::loadApp($app); self::$loadedApps[] = $app; + self::loadApp($app); } } ob_end_clean(); |