diff options
| -rw-r--r-- | core/libraries/Theme_View.php | 2 | ||||
| -rw-r--r-- | modules/rss/helpers/rss_theme.php | 5 | ||||
| -rw-r--r-- | modules/tag/helpers/tag_theme.php | 5 |
3 files changed, 12 insertions, 0 deletions
diff --git a/core/libraries/Theme_View.php b/core/libraries/Theme_View.php index 797679fd..84d86b0b 100644 --- a/core/libraries/Theme_View.php +++ b/core/libraries/Theme_View.php @@ -36,6 +36,8 @@ class Theme_View_Core extends View { if (user::active()->admin) { $this->theme_name = Input::instance()->get("theme", $this->theme_name); } + $this->item = null; + $this->tag = null; $this->set_global("theme", $this); $this->set_global("user", user::active()); $this->set_global("page_type", $page_type); diff --git a/modules/rss/helpers/rss_theme.php b/modules/rss/helpers/rss_theme.php index 634d24bb..5616b4a4 100644 --- a/modules/rss/helpers/rss_theme.php +++ b/modules/rss/helpers/rss_theme.php @@ -31,6 +31,11 @@ class rss_theme_Core { } static function sidebar_blocks($theme) { + // @todo this needs to be data driven + if (!$theme->item()) { + return; + } + $block = new Block(); $block->css_id = "gRss"; $block->title = t("Available RSS Feeds"); diff --git a/modules/tag/helpers/tag_theme.php b/modules/tag/helpers/tag_theme.php index 7a014d24..8f6b780a 100644 --- a/modules/tag/helpers/tag_theme.php +++ b/modules/tag/helpers/tag_theme.php @@ -24,6 +24,11 @@ class tag_theme_Core { } static function sidebar_blocks($theme) { + // @todo this needs to be data driven + if (!$theme->item()) { + return; + } + $block = new Block(); $block->css_id = "gTag"; $block->title = t("Popular Tags"); |