Skip to content
Browse files

Merge branch 'master' into branch_2.4

  • Loading branch information...
2 parents f4e7215 + d167d25 commit 441bee5df7b978184a9193328852615b53db5a98 @shish committed May 28, 2012
Showing with 11 additions and 2 deletions.
  1. +10 −1 core/basethemelet.class.php
  2. +1 −1 ext/tag_list/main.php
View
11 core/basethemelet.class.php
@@ -11,7 +11,16 @@ public function display_error(/*int*/ $code, /*string*/ $title, /*string*/ $mess
$page->add_http_header("HTTP/1.0 $code $title");
$page->set_title($title);
$page->set_heading($title);
- $page->add_block(new NavBlock());
+ $has_nav = false;
+ foreach($page->blocks as $block) {
+ if($block->header == "Navigation") {
+ $has_nav = true;
+ break;
+ }
+ }
+ if(!$has_nav) {
+ $page->add_block(new NavBlock());
+ }
$page->add_block(new Block("Error", $message));
}
View
2 ext/tag_list/main.php
@@ -438,7 +438,7 @@ private function add_refine_block(Page $page, /*string*/ $search) {
}
}
- if(count($related_tags) > 0) {
+ if(!empty($related_tags)) {
$this->theme->display_refine_block($page, $related_tags, $wild_tags);
}
}

0 comments on commit 441bee5

Please sign in to comment.
Something went wrong with that request. Please try again.