Commit d90c5a3a authored by Dries's avatar Dries

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.
parent 1c84b56e
......@@ -126,12 +126,15 @@ function footer() {
// 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");
......
<!-- BEGIN: header -->
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
......@@ -86,9 +85,11 @@
<!-- BEGIN: footer -->
</div><!-- main -->
</td>
<!-- BEGIN: blocks -->
<td valign="top" id="sidebar">
{blocks}
</td>
<!-- END: blocks -->
</tr>
</table>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment