diff options
author | Lukas Reschke <lukas@owncloud.com> | 2016-06-21 21:21:46 +0200 |
---|---|---|
committer | Lukas Reschke <lukas@owncloud.com> | 2016-06-27 10:26:23 +0200 |
commit | 27b699bdbcd080ec9d5400a2391cdb2b725f7ee1 (patch) | |
tree | 0cd0e124cb6e7ea4b6dfdf1958df4eafae48d240 /core | |
parent | cc321bc140f707257ffe1a11b4fa0238887e16fc (diff) | |
download | nextcloud-server-27b699bdbcd080ec9d5400a2391cdb2b725f7ee1.tar.gz nextcloud-server-27b699bdbcd080ec9d5400a2391cdb2b725f7ee1.zip |
Migrate logic to dynamic controller
Also adds support for having custom login backgrounds
Diffstat (limited to 'core')
-rw-r--r-- | core/js/config.php | 2 | ||||
-rw-r--r-- | core/shipped.json | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/js/config.php b/core/js/config.php index dc84d1cf2bf..197047ed8b8 100644 --- a/core/js/config.php +++ b/core/js/config.php @@ -43,7 +43,7 @@ header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); $l = \OC::$server->getL10N('core'); // Enable OC_Defaults support -$defaults = new OC_Defaults(); +$defaults = \OC::$server->getThemingDefaults(); // Get the config $apps_paths = array(); diff --git a/core/shipped.json b/core/shipped.json index a3abe22d8d5..ed9cf52fa72 100644 --- a/core/shipped.json +++ b/core/shipped.json @@ -32,6 +32,7 @@ "systemtags", "systemtags_management", "templateeditor", + "theming", "updatenotification", "user_external", "user_ldap", |