From 8cea95390dc2af3b50bb032571e29e29167dcfa5 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 22 Jul 2016 16:49:33 +0200 Subject: Make sure we try to autoload the class --- lib/private/Server.php | 9 ++++++++- lib/private/URLGenerator.php | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'lib/private') diff --git a/lib/private/Server.php b/lib/private/Server.php index de2970d9bfa..76d6bbad1ef 100644 --- 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 0f3c60b1323..93517dc9f7e 100644 --- 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; -- cgit v1.2.3