Merge pull request #971 from nextcloud/theming-fix-service-registration

Fix loading of ThemingDefaults
nextcloud · Aug 19, 2016 · cb7b44d · cb7b44d
2 parents b1299bb + 162b153
commit cb7b44d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/private/Server.php b/lib/private/Server.php
@@ -644,7 +644,7 @@ public function __construct($webRoot, \OC\Config $config) {
 		});
 		$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
@@ -158,6 +158,7 @@ public function dataTestQuery() {
 			['TagManager', '\OCP\ITagManager'],
 			['TempManager', '\OC\TempManager'],
 			['TempManager', '\OCP\ITempManager'],
+			['ThemingDefaults', '\OCA\Theming\ThemingDefaults'],
 			['TrustedDomainHelper', '\OC\Security\TrustedDomainHelper'],
 
 			['SystemTagManager', '\OCP\SystemTag\ISystemTagManager'],