Merge pull request #549 from nextcloud/backport-530-theming-autoloadi…

…ng-9 [stable9] Make sure we try to autoload the class
nextcloud · Jul 25, 2016 · 6175e5d · 6175e5d
2 parents d2396b9 + 593608f
commit 6175e5d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/private/server.php b/lib/private/server.php
@@ -567,7 +567,13 @@ public function __construct($webRoot, \OC\Config $config) {
 			return $factory->getManager();
 		});
 		$this->registerService('ThemingDefaults', function(Server $c) {
-			if(class_exists('OCA\Theming\Template', false) && $this->getConfig()->getSystemValue('installed', false) && $this->getAppManager()->isInstalled('theming')) {
+			try {
+				$classExists = class_exists('OCA\Theming\Template');
+			} catch (\OCP\AutoloadNotAllowedException $e) {
+				// App disabled or in maintenance mode
+				$classExists = false;
+			}
+			if ($classExists && $this->getConfig()->getSystemValue('installed', false) && $this->getAppManager()->isInstalled('theming')) {
 				return new Template(
 					$this->getConfig(),
 					$this->getL10N('theming'),

diff --git a/lib/private/urlgenerator.php b/lib/private/urlgenerator.php
@@ -29,7 +29,8 @@
  */
 
 namespace OC;
-use OC_Defaults;
+
+
 use OCP\ICacheFactory;
 use OCP\IConfig;
 use OCP\IURLGenerator;