Make sure we try to autoload the class

diff --git a/lib/private/Server.php b/lib/private/Server.php
index de2970d9bfadf1a72a1eade69edefe5a258ed694..76d6bbad1efff3945dd4b94f5bc3e83359c03f6b 100644 (file)
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -631,7 +631,14 @@ class Server extends ServerContainer implements IServerContainer {
                        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
index 0f3c60b1323258b6cdf2b4ba46e1c95bd56a0a5b..93517dc9f7e9c75ec4d12ba6635323513f9be5df 100644 (file)
--- a/lib/private/URLGenerator.php
+++ b/lib/private/URLGenerator.php
@@ -30,7 +30,8 @@
  */
 
 namespace OC;
-use OCP\Defaults;
+
+
 use OCP\ICacheFactory;
 use OCP\IConfig;
 use OCP\IURLGenerator;