summaryrefslogtreecommitdiffstats
path: root/lib/template
diff options
context:
space:
mode:
authorBjörn Schießle <schiessle@owncloud.com>2013-07-24 11:51:21 +0200
committerBjörn Schießle <schiessle@owncloud.com>2013-07-24 11:51:21 +0200
commit75fd6d4fde4cd6d9eda5e6b944739f1f2798447d (patch)
tree2d04d64bcdeb2ea13de68b9606307ebf799aeb87 /lib/template
parent2622839fcfb360eafc6d670885ca265ebed1433c (diff)
downloadnextcloud-server-75fd6d4fde4cd6d9eda5e6b944739f1f2798447d.tar.gz
nextcloud-server-75fd6d4fde4cd6d9eda5e6b944739f1f2798447d.zip
initialize OC_Defaults in template constructorX
Diffstat (limited to 'lib/template')
-rw-r--r--lib/template/base.php5
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 );