[Pkg-owncloud-commits] [owncloud] 03/18: Always add to $loadedApps

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit a2d456c195248a5465a9cd3fa600e1934d5021e8
Author: Robin McCorkell <rmccorkell at owncloud.com>
Date:   Sat Sep 5 11:43:00 2015 +0100

    Always add to $loadedApps
---
 lib/private/app.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/app.php b/lib/private/app.php
index f9cd03f..f12c95f 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -95,7 +95,6 @@ class OC_App {
 		ob_start();
 		foreach ($apps as $app) {
 			if ((is_null($types) or self::isType($app, $types)) && !in_array($app, self::$loadedApps)) {
-				self::$loadedApps[] = $app;
 				self::loadApp($app);
 			}
 		}
@@ -112,6 +111,7 @@ class OC_App {
 	 * @throws \OC\NeedsUpdateException
 	 */
 	public static function loadApp($app, $checkUpgrade = true) {
+		self::$loadedApps[] = $app;
 		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)) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git