--- includes/theme.inc	2004/02/27 09:36:50	1.1
+++ includes/theme.inc	2004/02/27 09:58:19
@@ -29,7 +29,7 @@
     $output .= "<table border=\"0\" cellspacing=\"4\" cellpadding=\"4\"><tr><td style=\"vertical-align: top; width: 170px;\">";
 
     print $output;
-    $this->box(t("Navigation"), @implode("<br />", link_page())); theme_blocks("all", $this);
+    $this->box(t("Navigation"), @implode("<br />", link_page())); theme_blocks("all");
     print "</td><td style=\"vertical-align: top;\">";
 
   }
@@ -189,9 +189,10 @@
 /**
  * Render blocks available for $user and $region calling $theme->block($region).
  *
- * @param   string  $region   main|left|right
+ * @param   string  $region     main|all|left|right
+ * @param   int     $test != 0: do not render; return true if would render
  */
-function theme_blocks($region) {
+function theme_blocks($region, $test = 0) {
   global $user;
 
   $result = db_query("SELECT * FROM {blocks} WHERE (status = '1' OR custom = '1') ". ($region != "all" ? "AND region = %d " : "") ."ORDER BY weight, module", $region == "left" ? 0 : 1);
@@ -200,6 +201,9 @@
     if ((($block->status && (!$user->uid || !$block->custom)) || ($block->custom && $user->block[$block->module][$block->delta])) && (!$block->path || preg_match($block->path, str_replace("?q=", "", request_uri())))) {
       $block_data = module_invoke($block->module, "block", "view", $block->delta);
       if ($block_data["content"]) {
+        if ($test) {
+	  return 1;
+	}
         theme("block", $block_data["subject"], $block_data["content"], $region);
       }
     }
--- themes/marvin/marvin.theme	2004/02/27 09:58:27	1.1
+++ themes/marvin/marvin.theme	2004/02/27 09:58:31
@@ -154,7 +154,7 @@
        </td>
        <td style="width: 200px; vertical-align: top;">
          <?php
-          theme_blocks("all", $this);
+          theme_blocks("all");
          ?>
        </td>
       </tr>
--- themes/unconed/unconed.theme	2004/02/27 09:58:37	1.1
+++ themes/unconed/unconed.theme	2004/02/27 09:58:39
@@ -178,7 +178,7 @@
        </td>
        <td valign="top" width="20%">
         <?php
-          theme_blocks("all", $this);
+          theme_blocks("all");
         ?>
        </td>
       </tr>





--- bluerobot2.theme	2004/02/27 10:00:36	1.1
+++ bluerobot2.theme	2004/02/27 10:00:07
@@ -110,9 +110,11 @@
   </div>
 
   <!-- Begin Menu -->
+  <?php if (theme_blocks("all", 1)) { ?>
   <div id="Menu">
-  <?php theme_blocks("all", $this); ?>
+  <?php theme_blocks("all"); ?>
   </div>
+  <?php } ?>
   <!-- End Menu -->
 
   <!-- Begin Footer -->