diff options
| author | root <roger.szabo@web.de> | 2016-07-25 16:56:14 +0800 |
|---|---|---|
| committer | root <roger.szabo@web.de> | 2016-07-25 16:56:14 +0800 |
| commit | 1fb080df2bd105ece36f32dba41f401167637a8b (patch) | |
| tree | 0350893b3ed6eae4e98852495064d367dbcbf0a1 /lib/private/Server.php | |
| parent | c1b37e4ccbc8b0f6fb195952b4b8cefe9c89ab08 (diff) | |
| parent | de4236bc4ae1a02141e1bf6d9ab60a9836cd965a (diff) | |
| download | nextcloud-server-1fb080df2bd105ece36f32dba41f401167637a8b.tar.gz nextcloud-server-1fb080df2bd105ece36f32dba41f401167637a8b.zip | |
Merge branch 'master' of https://github.com/nextcloud/server
Diffstat (limited to 'lib/private/Server.php')
| -rw-r--r-- | lib/private/Server.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/private/Server.php b/lib/private/Server.php index d7352613f27..16a6ee3ba64 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -642,7 +642,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'), |