diff options
| author | Julius Härtl <github@jus.li> | 2016-08-19 13:34:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-19 13:34:41 +0200 |
| commit | cb7b44d33d276ccc0bc305d1af50c10eb5802191 (patch) | |
| tree | fe54bd36e514519e49ef7f7b7d37f91d9c8f3d48 | |
| parent | b1299bb029a2e5ce40ebf7ab04926eed56e6f595 (diff) | |
| parent | 162b153f22452955a92d6972de9be70e2b77ca5f (diff) | |
| download | nextcloud-server-cb7b44d33d276ccc0bc305d1af50c10eb5802191.tar.gz nextcloud-server-cb7b44d33d276ccc0bc305d1af50c10eb5802191.zip | |
Merge pull request #971 from nextcloud/theming-fix-service-registration
Fix loading of ThemingDefaults
| -rw-r--r-- | lib/private/Server.php | 2 | ||||
| -rw-r--r-- | tests/lib/ServerTest.php | 1 |
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'], |