mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #972 from nextcloud/stable10-backport-971 

[stable10] Fix loading of ThemingDefaults
This commit is contained in:
Julius Härtl 2016-08-19 13:34:32 +02:00 committed by GitHub
parent c41bd47c0d fe15940233
commit a12ea5197b
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/private/Server.php
View File

@ -643,7 +643,7 @@ class Server extends ServerContainer implements IServerContainer {
}); });
$this->registerService('ThemingDefaults', function(Server $c) { $this->registerService('ThemingDefaults', function(Server $c) {
try { try {
$classExists = class_exists('OCA\Theming\Template'); $classExists = class_exists('OCA\Theming\ThemingDefaults');
} catch (\OCP\AutoloadNotAllowedException $e) { } catch (\OCP\AutoloadNotAllowedException $e) {
// App disabled or in maintenance mode // App disabled or in maintenance mode
$classExists = false; $classExists = false;

1
tests/lib/ServerTest.php
View File

@ -158,6 +158,7 @@ class ServerTest extends \Test\TestCase {
['TagManager', '\OCP\ITagManager'], ['TagManager', '\OCP\ITagManager'],
['TempManager', '\OC\TempManager'], ['TempManager', '\OC\TempManager'],
['TempManager', '\OCP\ITempManager'], ['TempManager', '\OCP\ITempManager'],
['ThemingDefaults', '\OCA\Theming\ThemingDefaults'],
['TrustedDomainHelper', '\OC\Security\TrustedDomainHelper'], ['TrustedDomainHelper', '\OC\Security\TrustedDomainHelper'],
['SystemTagManager', '\OCP\SystemTag\ISystemTagManager'], ['SystemTagManager', '\OCP\SystemTag\ISystemTagManager'],