diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-04-07 15:42:43 -0500 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2017-04-09 21:43:01 -0500 |
| commit | 5b4adf66e51e21b3ecbd683397a362b60f792a50 (patch) | |
| tree | 8bdc129ac9fd6575ee41be438ff667e49f7110a2 /lib/private/TemplateLayout.php | |
| parent | ca9d25169dcdd2923a356e2a797d8704506a3787 (diff) | |
| download | nextcloud-server-5b4adf66e51e21b3ecbd683397a362b60f792a50.tar.gz nextcloud-server-5b4adf66e51e21b3ecbd683397a362b60f792a50.zip | |
Move OC_Defaults to OCP\Defaults
* currently there are two ways to access default values:
OCP\Defaults or OC_Defaults (which is extended by
OCA\Theming\ThemingDefaults)
* our code used a mixture of both of them, which made
it hard to work on theme values
* this extended the public interface with the missing
methods and uses them everywhere to only rely on the
public interface
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'lib/private/TemplateLayout.php')
| -rw-r--r-- | lib/private/TemplateLayout.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php index 6dc925f8f8c..7a5984a4924 100644 --- a/lib/private/TemplateLayout.php +++ b/lib/private/TemplateLayout.php @@ -38,6 +38,7 @@ namespace OC; use OC\Template\JSCombiner; use OC\Template\JSConfigHelper; use OC\Template\SCSSCacher; +use OCP\Defaults; class TemplateLayout extends \OC_Template { @@ -135,7 +136,7 @@ class TemplateLayout extends \OC_Template { if (\OC::$server->getContentSecurityPolicyNonceManager()->browserSupportsCspV3()) { $jsConfigHelper = new JSConfigHelper( \OC::$server->getL10N('core'), - \OC::$server->getThemingDefaults(), + \OC::$server->query(Defaults::class), \OC::$server->getAppManager(), \OC::$server->getSession(), \OC::$server->getUserSession()->getUser(), |