From d90c5a3a4200d1531bb3b9a238e92acd0d29c042 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Thu, 15 May 2003 18:09:19 +0000 Subject: Patch by Ax: - Show sidebar only if there is at least one block. - Remove xml prolog; fixes http://lists.drupal.org/pipermail/drupal-devel/2003-May/024484.html. --- themes/xtemplate/xtemplate.theme | 7 +++++-- themes/xtemplate/xtemplate.xtmpl | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'themes') diff --git a/themes/xtemplate/xtemplate.theme b/themes/xtemplate/xtemplate.theme index 7bbabf995..d0bf0c053 100644 --- a/themes/xtemplate/xtemplate.theme +++ b/themes/xtemplate/xtemplate.theme @@ -126,12 +126,15 @@ class Theme_xtemplate extends BaseTheme { // so we need some output buffering ob_start(); theme_blocks("all"); + if ($blocks = ob_get_contents()) { + $this->template->assign("blocks", $blocks); + $this->template->parse("footer.blocks"); + } + ob_end_clean(); $this->template->assign( array( - "blocks" => ob_get_contents(), "footer_message" => variable_get("site_footer", ""), "footer" => theme_footer() )); - ob_end_clean(); $this->template->parse("footer"); print $this->template->text("footer"); diff --git a/themes/xtemplate/xtemplate.xtmpl b/themes/xtemplate/xtemplate.xtmpl index f6dfbfcd6..287739d42 100644 --- a/themes/xtemplate/xtemplate.xtmpl +++ b/themes/xtemplate/xtemplate.xtmpl @@ -1,5 +1,4 @@ - @@ -86,9 +85,11 @@ + {blocks} + -- cgit v1.2.3