From 43e9bd79c2fd84ea42fe9a051e5018efda6348f8 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Mon, 19 Jan 2004 22:23:37 +0000
Subject: - Patch 5256: code improvements: theme('header') + theme('footer') ->
 theme('page').   Patch by Gerhard.

---
 modules/aggregator.module            | 17 ++++++++---------
 modules/aggregator/aggregator.module | 17 ++++++++---------
 modules/queue.module                 |  9 ++++-----
 3 files changed, 20 insertions(+), 23 deletions(-)

(limited to 'modules')

diff --git a/modules/aggregator.module b/modules/aggregator.module
index f42ef3555..bf02f3abb 100644
--- a/modules/aggregator.module
+++ b/modules/aggregator.module
@@ -753,26 +753,25 @@ function aggregator_page_feeds() {
 }
 
 function aggregator_page_blocks($blocks) {
-  print theme("header");
-  print "<table cellpadding=\"0\" cellspacing=\"5\" border=\"0\" style=\"width: 100%;\">\n";
-  print " <tr>\n";
+  $output = "<table cellpadding=\"0\" cellspacing=\"5\" border=\"0\" style=\"width: 100%;\">\n";
+  $output .= " <tr>\n";
 
   for ($t = 0; $t < 3; $t++) {
     $i = 1;
-    print "  <td style=\"vertical-align: top; width: 33%;\">\n";
+    $output .= "  <td style=\"vertical-align: top; width: 33%;\">\n";
     while ($block = each($blocks)) {
-      print theme("box", $block["value"]["subject"], $block["value"]["content"]);
+      $output .= theme("box", $block["value"]["subject"], $block["value"]["content"]);
       if ($i == ceil(count($blocks) / 3)) {
         break;
       }
       $i++;
     }
-    print "  </td>\n";
+    $output .= "  </td>\n";
   }
 
-  print " </tr>\n";
-  print "</table>\n";
-  print theme("footer");
+  $output .= " </tr>\n";
+  $output .= "</table>\n";
+  print theme("page", $output);
 }
 
 function aggregator_page() {
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index f42ef3555..bf02f3abb 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -753,26 +753,25 @@ function aggregator_page_feeds() {
 }
 
 function aggregator_page_blocks($blocks) {
-  print theme("header");
-  print "<table cellpadding=\"0\" cellspacing=\"5\" border=\"0\" style=\"width: 100%;\">\n";
-  print " <tr>\n";
+  $output = "<table cellpadding=\"0\" cellspacing=\"5\" border=\"0\" style=\"width: 100%;\">\n";
+  $output .= " <tr>\n";
 
   for ($t = 0; $t < 3; $t++) {
     $i = 1;
-    print "  <td style=\"vertical-align: top; width: 33%;\">\n";
+    $output .= "  <td style=\"vertical-align: top; width: 33%;\">\n";
     while ($block = each($blocks)) {
-      print theme("box", $block["value"]["subject"], $block["value"]["content"]);
+      $output .= theme("box", $block["value"]["subject"], $block["value"]["content"]);
       if ($i == ceil(count($blocks) / 3)) {
         break;
       }
       $i++;
     }
-    print "  </td>\n";
+    $output .= "  </td>\n";
   }
 
-  print " </tr>\n";
-  print "</table>\n";
-  print theme("footer");
+  $output .= " </tr>\n";
+  $output .= "</table>\n";
+  print theme("page", $output);
 }
 
 function aggregator_page() {
diff --git a/modules/queue.module b/modules/queue.module
index 9d87d1bac..58a57599e 100644
--- a/modules/queue.module
+++ b/modules/queue.module
@@ -174,15 +174,14 @@ function queue_view($nid) {
     }
   }
 
-  print theme("header");
-  print node_view($node);
+  $output .= node_view($node);
   if ($output) {
-    print theme("box", t("Moderate"), $output);
+    $output .= theme("box", t("Moderate"), $output);
   }
   if ($node->comment && variable_get("queue_show_comments", 1)) {
-    print module_invoke("comment", "render", $node);
+    $output .= module_invoke("comment", "render", $node);
   }
-  print theme("footer");
+  print theme("page", $output);
 }
 
 function queue_page() {
-- 
cgit v1.2.3