diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/template.php | 3 | ||||
| -rw-r--r-- | lib/template/base.php | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/template.php b/lib/template.php index d17be753db8..9b2c1211e61 100644 --- a/lib/template.php +++ b/lib/template.php @@ -55,6 +55,7 @@ class OC_Template extends \OC\Template\Base { $parts = explode('/', $app); // fix translation when app is something like core/lostpassword $l10n = OC_L10N::get($parts[0]); + $themeDefaults = new OC_Defaults(); list($path, $template) = $this->findTemplate($theme, $app, $name, $fext); @@ -62,7 +63,7 @@ class OC_Template extends \OC\Template\Base { $this->renderas = $renderas; $this->path = $path; - parent::__construct($template, $requesttoken, $l10n); + parent::__construct($template, $requesttoken, $l10n, $themeDefaults); // Some headers to enhance security header('X-XSS-Protection: 1; mode=block'); // Enforce browser based XSS filters diff --git a/lib/template/base.php b/lib/template/base.php index c7ddaa2e8e1..88941bc7132 100644 --- a/lib/template/base.php +++ b/lib/template/base.php @@ -12,12 +12,14 @@ class Base { private $template; // The template private $vars; // Vars private $l10n; // The l10n-Object + private $theme; // theme defaults - public function __construct( $template, $requesttoken, $l10n ) { + public function __construct( $template, $requesttoken, $l10n, $theme ) { $this->vars = array(); $this->vars['requesttoken'] = $requesttoken; $this->l10n = $l10n; $this->template = $template; + $this->theme = $theme; } protected function getAppTemplateDirs($theme, $app, $serverroot, $app_dir) { @@ -113,6 +115,7 @@ class Base { // Register the variables $_ = $this->vars; $l = $this->l10n; + $theme = $this->theme; if( !is_null($additionalparams)) { $_ = array_merge( $additionalparams, $this->vars ); |