aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulius Haertl <jus@bitgrid.net>2016-08-19 11:26:22 +0200
committerJulius Haertl <jus@bitgrid.net>2016-08-19 11:26:22 +0200
commit162b153f22452955a92d6972de9be70e2b77ca5f (patch)
treedc109b72143869988b624b118b3c30f1914d4bfd
parent3ccd69707e75c3d99156c41d8107621e07a01ded (diff)
downloadnextcloud-server-162b153f22452955a92d6972de9be70e2b77ca5f.tar.gz
nextcloud-server-162b153f22452955a92d6972de9be70e2b77ca5f.zip
Fix loading of ThemingDefaults
-rw-r--r--lib/private/Server.php2
-rw-r--r--tests/lib/ServerTest.php1
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/Server.php b/lib/private/Server.php
index eb49155adef..86eee54be70 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -644,7 +644,7 @@ class Server extends ServerContainer implements IServerContainer {
});
$this->registerService('ThemingDefaults', function(Server $c) {
try {
- $classExists = class_exists('OCA\Theming\Template');
+ $classExists = class_exists('OCA\Theming\ThemingDefaults');
} catch (\OCP\AutoloadNotAllowedException $e) {
// App disabled or in maintenance mode
$classExists = false;
diff --git a/tests/lib/ServerTest.php b/tests/lib/ServerTest.php
index 534f3f8cfd5..2e5900c4ce5 100644
--- a/tests/lib/ServerTest.php
+++ b/tests/lib/ServerTest.php
@@ -158,6 +158,7 @@ class ServerTest extends \Test\TestCase {
['TagManager', '\OCP\ITagManager'],
['TempManager', '\OC\TempManager'],
['TempManager', '\OCP\ITempManager'],
+ ['ThemingDefaults', '\OCA\Theming\ThemingDefaults'],
['TrustedDomainHelper', '\OC\Security\TrustedDomainHelper'],
['SystemTagManager', '\OCP\SystemTag\ISystemTagManager'],