Merge pull request #7107 from owncloud/load-apps-proper-master

Load apps proper master

4 files changed, 1 insertions, 7 deletions

diff --git a/core/ajax/share.php b/core/ajax/share.php
index 3f04e1e4ad1..e667d9b5faa 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -21,7 +21,6 @@
 
 OC_JSON::checkLoggedIn();
 OCP\JSON::callCheck();
-OC_App::loadApps();
 
 $defaults = new \OCP\Defaults();
 
diff --git a/core/ajax/update.php b/core/ajax/update.php
index 2a0cbb2036d..55e8ab15ec2 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -1,6 +1,5 @@
 <?php
 set_time_limit(0);
-$RUNTIME_NOAPPS = true;
 require_once '../../lib/base.php';
 
 if (OC::checkUpgrade(false)) {
diff --git a/core/command/upgrade.php b/core/command/upgrade.php
index cfccfb5d2f0..ed72d136e24 100644
--- a/core/command/upgrade.php
+++ b/core/command/upgrade.php
@@ -34,9 +34,6 @@ class Upgrade extends Command {
 	 * @param OutputInterface $output output interface
 	 */
 	protected function execute(InputInterface $input, OutputInterface $output) {
-		global $RUNTIME_NOAPPS;
-
-		$RUNTIME_NOAPPS = true; //no apps, yet
 
 		require_once \OC::$SERVERROOT . '/lib/base.php';
 
diff --git a/core/command/user/report.php b/core/command/user/report.php
index 70c5a8566b7..a5159310af1 100644
--- a/core/command/user/report.php
+++ b/core/command/user/report.php
@@ -46,7 +46,6 @@ class Report extends Command {
 	}
 
 	private function countUsers() {
-		\OC_App::loadApps(array('authentication'));
 		$userManager = \OC::$server->getUserManager();
 		return $userManager->countUsers();
 	}
@@ -56,4 +55,4 @@ class Report extends Command {
 		$userDirectories = $dataview->getDirectoryContent('/', 'httpd/unix-directory');
 		return count($userDirectories);
 	}
-}
\ No newline at end of file
+}