Skip to content

[stable9] Fix maintenance mode #442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
schiessle merged 1 commit into from
Jul 19, 2016
Merged

[stable9] Fix maintenance mode #442

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Fix maintenance mode 
When the server is in maintenance mode, apps are not loaded.
That means apps/theming/ is not in the allowed paths. So we
need to check without autoloading, whether the class exists.
  • Loading branch information
@nickvergessen
nickvergessen committed Jul 19, 2016
commit 3024f20270c9c6f978a4464f4d85d372939b4e6a
2 changes: 1 addition & 1 deletion lib/private/server.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ public function __construct($webRoot, \OC\Config $config) {
return $factory->getManager();
});
$this->registerService('ThemingDefaults', function(Server $c) {
if($this->getConfig()->getSystemValue('installed', false) && $this->getAppManager()->isInstalled('theming')) {
if(class_exists('OCA\Theming\Template', false) && $this->getConfig()->getSystemValue('installed', false) && $this->getAppManager()->isInstalled('theming')) {
return new Template(
$this->getConfig(),
$this->getL10N('theming'),
Expand Down