summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-06-30 21:09:38 -0700
committerBharat Mediratta <bharat@menalto.com>2009-06-30 21:09:38 -0700
commit58e3e469b97e5afa10e76af751130111a14b9c54 (patch)
treeedbcc5a72968ff5e00653b3e65d62395e7d1aa6d /modules
parent79de82bcccd3ec4412a1b5015644c40e082777f4 (diff)
parenta9b27fb352490a48d4035966b8c8d463c62c7726 (diff)
Merge branch 'master' of git://github.com/hiwilson/gallery3
Diffstat (limited to 'modules')
-rw-r--r--modules/tag/helpers/tag_theme.php5
1 files changed, 1 insertions, 4 deletions
diff --git a/modules/tag/helpers/tag_theme.php b/modules/tag/helpers/tag_theme.php
index b48ad178..fe30354f 100644
--- a/modules/tag/helpers/tag_theme.php
+++ b/modules/tag/helpers/tag_theme.php
@@ -28,9 +28,6 @@ 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";
@@ -38,7 +35,7 @@ class tag_theme_Core {
$block->content = new View("tag_block.html");
$block->content->cloud = tag::cloud(30);
- if ($theme->page_type() != "tag" && access::can("edit", $theme->item())) {
+ if ($theme->item() && $theme->page_type() != "tag" && access::can("edit", $theme->item())) {
$controller = new Tags_Controller();
$block->content->form = tag::get_add_form($theme->item());
} else {