Merge pull request #4177 from owncloud/move_defaults_to_template_constructor

Move defaults to template constructor

1 files changed, 4 insertions, 1 deletions

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 );