From fb3611a56712871891b8415adc029931a659bfc2 Mon Sep 17 00:00:00 2001
From: tjhunt <tjhunt>
Date: Wed, 22 Jul 2009 06:38:26 +0000
Subject: [PATCH] blocks MDL-19902: were seeing empty block columns on the
 front page when not logged in.

It turns out the only reliable way to find out whether blocks will appear is to get the contents. :-(
---
 theme/standard/layout-home.php | 4 ++--
 theme/standard/layout.php      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/theme/standard/layout-home.php b/theme/standard/layout-home.php
index e5c45d511f..452e6568a7 100644
--- a/theme/standard/layout-home.php
+++ b/theme/standard/layout-home.php
@@ -29,7 +29,7 @@
      a multi-column cross-browser layout too, so this is a temporary hack. -->
     <table id="layout-table" summary="layout">
         <tr>
-            <?php if ($PAGE->blocks->region_has_content('side-pre')) { ?>
+            <?php if ($PAGE->blocks->region_has_content('side-pre', $OUTPUT)) { ?>
             <td id="region-side-pre" class="block-region">
                 <?php echo $OUTPUT->blocks_for_region('side-pre') ?>
             </td>
@@ -37,7 +37,7 @@
             <td id="content">
                 [MAIN CONTENT GOES HERE]
             </td>
-            <?php if ($PAGE->blocks->region_has_content('side-post')) { ?>
+            <?php if ($PAGE->blocks->region_has_content('side-post', $OUTPUT)) { ?>
             <td id="region-side-post" class="block-region">
                 <?php echo $OUTPUT->blocks_for_region('side-post') ?>
             </td>
diff --git a/theme/standard/layout.php b/theme/standard/layout.php
index 1b9bbaff5e..7e6a41062d 100644
--- a/theme/standard/layout.php
+++ b/theme/standard/layout.php
@@ -32,7 +32,7 @@
      a multi-column cross-browser layout too, so this is a temporary hack. -->
     <table id="layout-table" summary="layout">
         <tr>
-            <?php if ($PAGE->blocks->region_has_content('side-pre')) { ?>
+            <?php if ($PAGE->blocks->region_has_content('side-pre', $OUTPUT)) { ?>
             <td id="region-side-pre" class="block-region">
                 <?php echo $OUTPUT->blocks_for_region('side-pre') ?>
             </td>
@@ -40,7 +40,7 @@
             <td id="content">
                 [MAIN CONTENT GOES HERE]
             </td>
-            <?php if ($PAGE->blocks->region_has_content('side-post')) { ?>
+            <?php if ($PAGE->blocks->region_has_content('side-post', $OUTPUT)) { ?>
             <td id="region-side-post" class="block-region">
                 <?php echo $OUTPUT->blocks_for_region('side-post') ?>
             </td>
-- 
2.39.5