summaryrefslogtreecommitdiff
path: root/core/libraries/Theme_View.php
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2008-12-24 04:22:22 +0000
committerBharat Mediratta <bharat@menalto.com>2008-12-24 04:22:22 +0000
commitc7193f9b2ede6ed913d16a9a8047b6867b8afada (patch)
treecd7bf045bb8f6a971eda11de9b91b4c61d52f4f6 /core/libraries/Theme_View.php
parentb2c9a59d1b80cfe651c740c2eabbc0862a7a867e (diff)
Normalize our Admin controllers so that functions always print out
their results, as opposed to having them return their view back upstream. This is a little more code in every controller, but it's much less magical and more consistent. Look up the active_theme and active_admin_theme inside the view itself, no need to do that in the controllers. This makes view initialization easier in the controllers.
Diffstat (limited to 'core/libraries/Theme_View.php')
-rw-r--r--core/libraries/Theme_View.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/libraries/Theme_View.php b/core/libraries/Theme_View.php
index 030e564d..37507a70 100644
--- a/core/libraries/Theme_View.php
+++ b/core/libraries/Theme_View.php
@@ -29,9 +29,10 @@ class Theme_View_Core extends View {
* @param string $theme_name view name
* @return void
*/
- public function __construct($name, $page_type, $theme_name="default") {
+ public function __construct($name, $page_type) {
parent::__construct($name);
- $this->theme_name = $theme_name;
+
+ $this->theme_name = module::get_var("core", "active_theme");
$this->set_global('theme', $this);
$this->set_global('user', user::active());
$this->set_global("page_type", $page_type);