Index: index.php
===================================================================
RCS file: /Users/Shared/code/drupal/index.php,v
retrieving revision 1.94
diff -u -p -r1.94 index.php
--- index.php	26 Dec 2007 08:46:48 -0000	1.94
+++ index.php	11 Aug 2008 18:47:14 -0000
@@ -21,19 +21,21 @@ $return = menu_execute_active_handler();
 if (is_int($return)) {
   switch ($return) {
     case MENU_NOT_FOUND:
-      drupal_not_found();
+      $elements = drupal_not_found();
       break;
     case MENU_ACCESS_DENIED:
-      drupal_access_denied();
+      $elements = drupal_access_denied();
       break;
     case MENU_SITE_OFFLINE:
-      drupal_site_offline();
+      $elements = drupal_site_offline();
       break;
   }
 }
 elseif (isset($return)) {
   // Print any value (including an empty string) except NULL or undefined:
-  print theme('page', $return);
+  $elements = drupal_build_page($return);
 }
 
+echo drupal_render_page($elements);
+
 drupal_page_footer();
Index: includes/common.inc
===================================================================
RCS file: /Users/Shared/code/drupal/includes/common.inc,v
retrieving revision 1.781
diff -u -p -r1.781 common.inc
--- includes/common.inc	2 Aug 2008 19:01:02 -0000	1.781
+++ includes/common.inc	11 Aug 2008 21:20:47 -0000
@@ -47,20 +47,18 @@ function drupal_set_content($region = NU
  * @param $region
  *   A specified region to fetch content for. If NULL, all regions will be
  *   returned.
- * @param $delimiter
- *   Content to be inserted between exploded array elements.
  */
-function drupal_get_content($region = NULL, $delimiter = ' ') {
+function drupal_get_content($region = NULL) {
   $content = drupal_set_content();
   if (isset($region)) {
     if (isset($content[$region]) && is_array($content[$region])) {
-      return implode($delimiter, $content[$region]);
+      return $content[$region];
     }
   }
   else {
     foreach (array_keys($content) as $region) {
-      if (is_array($content[$region])) {
-        $content[$region] = implode($delimiter, $content[$region]);
+      if (!is_array($content[$region])) {
+        $content[$region] = array();
       }
     }
     return $content;
@@ -331,8 +329,15 @@ function drupal_site_offline() {
   drupal_maintenance_theme();
   drupal_set_header('HTTP/1.1 503 Service unavailable');
   drupal_set_title(t('Site offline'));
-  print theme('maintenance_page', filter_xss_admin(variable_get('site_offline_message',
-    t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => variable_get('site_name', 'Drupal'))))));
+
+  $elements['page'] = array(
+    '#title' => drupal_get_title(),
+    '#theme' => 'maintenance_page',
+    '#content' => array(
+      '#markup' => filter_xss_admin(variable_get('site_offline_message', t('@site is currently under maintenance. We should be back shortly. Thank you for your patience.', array('@site' => variable_get('site_name', 'Drupal'))))),
+    ),
+  );
+  return $elements;
 }
 
 /**
@@ -358,11 +363,11 @@ function drupal_not_found() {
 
   if (empty($return) || $return == MENU_NOT_FOUND || $return == MENU_ACCESS_DENIED) {
     drupal_set_title(t('Page not found'));
-    $return = t('The requested page could not be found.');
+    $return = array('#markup' => t('The requested page could not be found.'));
   }
 
   // To conserve CPU and bandwidth, omit the blocks.
-  print theme('page', $return, FALSE);
+  return drupal_build_page($return, FALSE, TRUE, FALSE);
 }
 
 /**
@@ -387,9 +392,122 @@ function drupal_access_denied() {
 
   if (empty($return) || $return == MENU_NOT_FOUND || $return == MENU_ACCESS_DENIED) {
     drupal_set_title(t('Access denied'));
-    $return = t('You are not authorized to access this page.');
+    $return = array('#markup' => t('You are not authorized to access this page.'));
   }
-  print theme('page', $return);
+  return drupal_build_page($return, TRUE, TRUE, FALSE);
+}
+
+/**
+ * Build a structured array with page content and theme parameters.
+ */
+function drupal_build_page($content, $show_blocks = TRUE, $show_messages = TRUE, $success = TRUE) {
+  if (!is_array($content)) {
+    $content = array('#markup' => $content);
+  }
+  $elements = array(
+    '#title' => drupal_get_title(),
+    '#theme' => 'page',
+    '#show_blocks' => $show_blocks,
+    '#show_messages' => $show_messages,
+    '#success' => $success,
+    'content' => $content,
+  );
+
+  global $theme;
+
+  $regions = system_region_list($theme);
+  // Load all region content assigned via blocks.
+  foreach (array_keys($regions) as $region) {
+    if (!isset($elements[$region])) {
+      $elements[$region] =  array();
+    }
+    // Prevent left and right regions from rendering blocks when 'show_blocks' == FALSE.
+    if (!(!$show_blocks && ($region == 'left' || $region == 'right'))) {
+      $elements[$region]['blocks'] = array('#markup' => theme('blocks', $region));
+    }
+  }
+
+  // Alter any part of the page before it's rendered.
+  drupal_alter('page', $elements);
+  return page_elements_builder($elements);
+}
+
+/**
+ * Adds any required properties non-form elements on the page.
+ *
+ * Similar to form_builder().
+ */
+function page_elements_builder($elements) {
+  // Use element defaults.
+  if ((!empty($elements['#type'])) && ($info = _element_info($elements['#type']))) {
+    // Overlay $info onto $form, retaining preexisting keys in $form.
+    $elements += $info;
+  }
+
+  // We start off assuming all elements are in the correct order.
+  $elements['#sorted'] = TRUE;
+
+  // Recurse through all child elements.
+  $count = 0;
+  foreach (element_children($elements) as $key) {
+    // Assign a decimal placeholder weight to preserve original array order.
+    if (!isset($form[$key]['#weight'])) {
+      $elements[$key]['#weight'] = $count/1000;
+    }
+    else {
+      // If one of the child elements has a weight then we will need to sort
+      // later.
+      unset($elements['#sorted']);
+    }
+    if ($elements[$key]['#type'] != 'form') {
+      $elements[$key] = page_elements_builder($elements[$key]);
+    }
+    $count++;
+  }
+  return $elements;
+}
+
+function drupal_render_page($elements) {
+  $render_type = '';
+  if (isset($_GET['render'])) {
+    $render_type = $_GET['render'];
+  }
+  // jQuery sets a HTTP_X_REQUESTED_WITH header of 'XMLHttpRequest'.
+  if (!$render_type) {
+    // Set the render type based on the request header.
+    if (isset($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest') {
+      $render_type = 'json';
+    }
+    else {
+      $render_type = 'xhtml';
+    }
+  }
+  switch ($render_type) {
+    case 'xhtml':
+    case 'html':
+      $render = 'drupal_render';
+      break;
+
+    default:
+      $render = 'drupal_' . $render_type . '_render';
+      if (!drupal_function_exists($render)) {
+        $render = 'drupal_render';
+      }
+      break;
+  }
+
+  return $render($elements);
+}
+
+/**
+ * Render the elements into simple XML.
+ */
+function drupal_xml_render($elements) {
+  return drupal_render($elements, 'theme_xml');
+}
+
+function render(&$element) {
+  echo drupal_render($element);
 }
 
 /**
@@ -2068,7 +2186,7 @@ function drupal_get_js($scope = 'header'
   // with HTML 4, we need to comment out the CDATA-tag.
   $embed_prefix = "\n<!--//--><![CDATA[//><!--\n";
   $embed_suffix = "\n//--><!]]>\n";
- 
+
   foreach ($javascript as $type => $data) {
     if (!$data) continue;
 
@@ -2699,7 +2817,7 @@ function drupal_alter($type, &$data) {
 
 
 /**
- * Renders HTML given a structured array tree.
+ * Renders HTML or other output given a structured array tree.
  *
  * Recursively iterates over each of the array elements, generating HTML code.
  * This function is usually called from within a another function, like
@@ -2707,10 +2825,13 @@ function drupal_alter($type, &$data) {
  *
  * @param $elements
  *   The structured array describing the data to be rendered.
+ * @param $callback
+ *   Optional parameter defining which function to use to mediate conversion of
+ *   each elemement to a string.  Use the default, 'theme', for XHTML.
  * @return
- *   The rendered HTML.
+ *   The rendered content (XHTML or other depending on $callback).
  */
-function drupal_render(&$elements) {
+function drupal_render(&$elements, $callback = 'theme') {
   if (!isset($elements) || (isset($elements['#access']) && !$elements['#access'])) {
     return NULL;
   }
@@ -2729,7 +2850,7 @@ function drupal_render(&$elements) {
   if (isset($elements['#pre_render'])) {
     foreach ($elements['#pre_render'] as $function) {
       if (drupal_function_exists($function)) {
-        $elements = $function($elements);
+        $elements = $function($elements, $callback);
       }
     }
   }
@@ -2754,12 +2875,12 @@ function drupal_render(&$elements) {
         $elements['#markup'] = '';
       }
 
-      $content = theme($elements['#theme'], $elements);
+      $content = $callback($elements['#theme'], $elements);
     }
     // Render each of the children using drupal_render and concatenate them.
     if (!isset($content) || $content === '') {
       foreach ($children as $key) {
-        $content .= drupal_render($elements[$key]);
+        $content .= drupal_render($elements[$key], $callback);
       }
     }
   }
@@ -2769,7 +2890,8 @@ function drupal_render(&$elements) {
 
   // Until now, we rendered the children, here we render the element itself
   if (!isset($elements['#printed'])) {
-    $content = theme(!empty($elements['#type']) ? $elements['#type'] : 'markup', $elements);
+    // The default $callback is 'theme'.
+    $content = $callback(!empty($elements['#type']) ? $elements['#type'] : 'markup', $elements);
     $elements['#printed'] = TRUE;
   }
 
@@ -2780,7 +2902,7 @@ function drupal_render(&$elements) {
     if (isset($elements['#post_render'])) {
       foreach ($elements['#post_render'] as $function) {
         if (drupal_function_exists($function)) {
-          $content = $function($content, $elements);
+          $content = $function($content, $elements, $callback);
         }
       }
     }
@@ -2790,6 +2912,139 @@ function drupal_render(&$elements) {
   }
 }
 
+
+/**
+ * Renders elements of structured array tree, retaining the structure.
+ *
+ * Recursively iterates over each of the array elements, generating output.
+ * This function is usually called from within a another function.
+ *
+ * @param $elements
+ *   The structured array describing the data to be rendered.
+ * @param $callback
+ *   Optional parameter defining which funciton to use to mediate conversion of
+ *   each elemement to a string.  Use the default, 'theme', for HTML.
+ * @return
+ *   The rendered HTML.
+ */
+function drupal_render_array(&$elements, $callback = 'theme') {
+  if (!isset($elements) || (isset($elements['#access']) && !$elements['#access'])) {
+    $elements = NULL;
+  }
+
+  // If the default values for this element haven't been loaded yet, populate
+  // them.
+  if (!isset($elements['#defaults_loaded']) || !$elements['#defaults_loaded']) {
+    if ((!empty($elements['#type'])) && ($info = _element_info($elements['#type']))) {
+      $elements += $info;
+    }
+  }
+
+  // Make any final changes to the element before it is rendered. This means
+  // that the $element or the children can be altered or corrected before the
+  // element is rendered into the final text.
+  if (isset($elements['#pre_render'])) {
+    foreach ($elements['#pre_render'] as $function) {
+      if (drupal_function_exists($function)) {
+        $elements = $function($elements, $callback);
+      }
+    }
+  }
+
+  $content = '';
+  // Either the elements did not go through form_builder or one of the children
+  // has a #weight.
+  if (!isset($elements['#sorted'])) {
+    uasort($elements, "element_sort");
+  }
+  $elements += array('#title' => NULL, '#description' => NULL);
+  if (!isset($elements['#children'])) {
+    $children = element_children($elements);
+    /* Render all the children that use a theme function */
+    if (!$children && isset($elements['#theme']) && empty($elements['#theme_used'])) {
+      $elements['#theme_used'] = TRUE;
+
+      $previous = array();
+      foreach (array('#type', '#prefix', '#suffix') as $key) {
+        $previous[$key] = isset($elements[$key]) ? $elements[$key] : NULL;
+      }
+      // If we rendered a single element, then we will skip the renderer.
+      $elements['#printed'] = TRUE;
+      $elements['#type'] = 'markup';
+      $elements['#value'] = '';
+
+      unset($elements['#prefix'], $elements['#suffix']);
+
+      $args[] = $elements['#theme'];
+      $args[] = $elements;
+      if (!empty($elements['#theme arguments'])) {
+        foreach($elements['#theme arguments'] as $value) {
+          $args[] = $value;
+        }
+      }
+      // The default $callback is 'theme'.
+      $content = call_user_func_array($callback, $args);
+
+      foreach (array('#type', '#prefix', '#suffix') as $key) {
+        $elements[$key] = isset($previous[$key]) ? $previous[$key] : NULL;
+      }
+    }
+    // Render each of the children using drupal_render_array
+    if (!isset($content) || $content === '') {
+      foreach ($children as $key) {
+        drupal_render_array($elements[$key], $callback);
+      }
+    }
+  }
+
+  // Until now, we rendered the children, here we render the element itself
+  if (!isset($elements['#printed']) && !$children) {
+    // The default $callback is 'theme'.
+    $content = $callback(!empty($elements['#type']) ? $elements['#type'] : 'markup', $elements);
+    $elements['#printed'] = TRUE;
+  }
+
+  if (isset($content) && $content !== '') {
+    // Filter the outputted content and make any last changes before the
+    // content is sent to the browser. The changes are made on $content
+    // which allows the output'ed text to be filtered.
+    if (isset($elements['#post_render'])) {
+      foreach ($elements['#post_render'] as $function) {
+        if (drupal_function_exists($function)) {
+          $content = $function($content, $elements, $callback);
+        }
+      }
+    }
+    $prefix = isset($elements['#prefix']) ? $elements['#prefix'] : '';
+    $suffix = isset($elements['#suffix']) ? $elements['#suffix'] : '';
+    $elements['#value'] = $prefix . $content . $suffix;
+  }
+}
+
+function element_property_preserve_in_array($key) {
+  switch ($key) {
+    case '#title':
+    case '#value':
+    case '#type':
+      return TRUE;
+
+    default:
+      return FALSE;
+  }
+}
+
+function drupal_json_render($elements) {
+  drupal_set_header('Content-Type: text/javascript; charset=utf-8');
+  drupal_render_array($elements);
+  return drupal_to_js($elements);
+}
+
+function drupal_printr_render($elements) {
+  drupal_set_header('Content-Type: text/plain; charset=utf-8');
+  drupal_render_array($elements);
+  return print_r($elements, 1);
+}
+
 /**
  * Function used by uasort to sort structured arrays by weight.
  */
@@ -2840,18 +3095,18 @@ function drupal_common_theme() {
       'arguments' => array('text' => NULL)
     ),
     'page' => array(
-      'arguments' => array('content' => NULL, 'show_blocks' => TRUE, 'show_messages' => TRUE),
+      'arguments' => array('elements' => NULL, 'show_blocks' => TRUE, 'show_messages' => TRUE),
       'template' => 'page',
     ),
     'maintenance_page' => array(
-      'arguments' => array('content' => NULL, 'show_blocks' => TRUE, 'show_messages' => TRUE),
+      'arguments' => array('elements' => NULL, 'show_blocks' => TRUE, 'show_messages' => TRUE),
       'template' => 'maintenance-page',
     ),
     'update_page' => array(
-      'arguments' => array('content' => NULL, 'show_messages' => TRUE),
+      'arguments' => array('elements' => NULL, 'show_messages' => TRUE),
     ),
     'install_page' => array(
-      'arguments' => array('content' => NULL),
+      'arguments' => array('elements' => NULL),
     ),
     'task_list' => array(
       'arguments' => array('items' => NULL, 'active' => NULL),
Index: includes/form.inc
===================================================================
RCS file: /Users/Shared/code/drupal/includes/form.inc,v
retrieving revision 1.277
diff -u -p -r1.277 form.inc
--- includes/form.inc	18 Jul 2008 07:06:24 -0000	1.277
+++ includes/form.inc	11 Aug 2008 20:04:22 -0000
@@ -143,9 +143,10 @@ function drupal_get_form($form_id) {
     $form = drupal_rebuild_form($form_id, $form_state, $args);
   }
 
-  // If we haven't redirected to a new location by now, we want to
-  // render whatever form array is currently in hand.
-  return drupal_render_form($form_id, $form);
+  // If we haven't redirected to a new location by now, we want to prepare for
+  // rendering whatever form array is currently in hand.
+  drupal_set_form_theme($form_id, $form);
+  return $form;
 }
 
 /**
@@ -586,7 +587,7 @@ function drupal_validate_form($form_id, 
  *   A string containing the path of the page to display when processing
  *   is complete.
  */
-function drupal_render_form($form_id, &$form) {
+function drupal_set_form_theme($form_id, &$form) {
   // Don't override #theme if someone already set it.
   if (!isset($form['#theme'])) {
     init_theme();
@@ -595,9 +596,6 @@ function drupal_render_form($form_id, &$
       $form['#theme'] = $form_id;
     }
   }
-
-  $output = drupal_render($form);
-  return $output;
 }
 
 /**
Index: includes/theme.inc
===================================================================
RCS file: /Users/Shared/code/drupal/includes/theme.inc,v
retrieving revision 1.431
diff -u -p -r1.431 theme.inc
--- includes/theme.inc	2 Aug 2008 19:01:02 -0000	1.431
+++ includes/theme.inc	11 Aug 2008 20:18:06 -0000
@@ -476,6 +476,14 @@ function list_themes($refresh = FALSE) {
 }
 
 /**
+ * Dummy function for now.
+ */
+function theme_xml() {
+  $args = func_get_args();
+  return call_user_func_array('theme', $args);
+}
+
+/**
  * Generate the themed output.
  *
  * All requests for theme hooks must go through this function. It examines
@@ -557,14 +565,14 @@ function list_themes($refresh = FALSE) {
  *   so that if the specific theme hook isn't implemented anywhere, a more
  *   generic one will be used. This can allow themes to create specific theme
  *   implementations for named objects.
- * @param ...
- *   Additional arguments to pass along to the theme function.
+ * @param $elements
+ *   (optional) the data to be converted to html. Typically this is a structured
+ *   array (such as a form element), but it may also be a scalar (e.g. string)
+ *   for very simple theme functions like theme_placeholder().
  * @return
- *   An HTML string that generates the themed output.
+ *   An HTML string that contains the themed output.
  */
-function theme() {
-  $args = func_get_args();
-  $hook = array_shift($args);
+function theme($hook, $elements = array()) {
 
   static $hooks = NULL;
   if (!isset($hooks)) {
@@ -601,20 +609,14 @@ function theme() {
   }
   if (isset($info['function'])) {
     // The theme call is a function.
-    $output = call_user_func_array($info['function'], $args);
+    $output = call_user_func($info['function'], $elements);
   }
   else {
     // The theme call is a template.
     $variables = array(
       'template_files' => array()
     );
-    if (!empty($info['arguments'])) {
-      $count = 0;
-      foreach ($info['arguments'] as $name => $default) {
-        $variables[$name] = isset($args[$count]) ? $args[$count] : $default;
-        $count++;
-      }
-    }
+    $variables['elements'] = $elements;
 
     // default render function and extension.
     $render_function = 'theme_render_template';
@@ -637,12 +639,9 @@ function theme() {
     }
 
     if (isset($info['preprocess functions']) && is_array($info['preprocess functions'])) {
-      // This construct ensures that we can keep a reference through
-      // call_user_func_array.
-      $args = array(&$variables, $hook);
       foreach ($info['preprocess functions'] as $preprocess_function) {
         if (drupal_function_exists($preprocess_function)) {
-          call_user_func_array($preprocess_function, $args);
+          $preprocess_function($variables, $hook);
         }
       }
     }
@@ -1097,8 +1096,10 @@ function theme_status_messages($display 
  * @return
  *   A string containing an unordered list of links.
  */
-function theme_links($links, $attributes = array('class' => 'links')) {
+function theme_links($element) {
   $output = '';
+  $links = $element['#links'];
+  $attributes = isset($element['#attributes']) ? $element['#attributes'] : array('class' => 'links');
 
   if (count($links) > 0) {
     $output = '<ul' . drupal_attributes($attributes) . '>';
@@ -1278,7 +1279,13 @@ function theme_submenu($links) {
  * @return
  *   An HTML string representing the table.
  */
-function theme_table($header, $rows, $attributes = array(), $caption = NULL, $colgroups = array()) {
+function theme_table($element) {
+  
+  $header = $element['#header'];
+  $rows = $element['#rows'];
+  $attributes = isset($element['#attributes']) ? $element['#attributes'] : array();
+  $caption = NULL;
+  $colgroups = isset($element['#colgroups']) ? $element['#colgroups'] : array();
 
   // Add sticky headers, if applicable.
   if (count($header)) {
@@ -1786,17 +1793,8 @@ function template_preprocess_page(&$vari
   global $theme;
   // Populate all block regions.
   $regions = system_region_list($theme);
-  // Load all region content assigned via blocks.
   foreach (array_keys($regions) as $region) {
-    // Prevent left and right regions from rendering blocks when 'show_blocks' == FALSE.
-    if (!(!$variables['show_blocks'] && ($region == 'left' || $region == 'right'))) {
-      $blocks = theme('blocks', $region);
-    }
-    else {
-      $blocks = '';
-    }
-    // Assign region to a region variable.
-    isset($variables[$region]) ? $variables[$region] .= $blocks : $variables[$region] = $blocks;
+    $variables[$region] = &$variables['elements'][$region];
   }
 
   // Set up layout variable.
@@ -1823,6 +1821,8 @@ function template_preprocess_page(&$vari
       $head_title[] = variable_get('site_slogan', '');
     }
   }
+
+  $variables['content']           = &$variables['elements']['content'];
   $variables['head_title']        = implode(' | ', $head_title);
   $variables['base_path']         = base_path();
   $variables['front_page']        = url();
@@ -1834,7 +1834,7 @@ function template_preprocess_page(&$vari
   $variables['language']          = $GLOBALS['language'];
   $variables['language']->dir     = $GLOBALS['language']->direction ? 'rtl' : 'ltr';
   $variables['logo']              = theme_get_setting('logo');
-  $variables['messages']          = $variables['show_messages'] ? theme('status_messages') : '';
+  $variables['messages']          = $variables['elements']['#show_messages'] ? theme('status_messages') : '';
   $variables['mission']           = isset($mission) ? $mission : '';
   $variables['main_menu']     = theme_get_setting('toggle_main_menu') ? menu_main_menu() : array();
   $variables['secondary_menu']   = theme_get_setting('toggle_secondary_menu') ? menu_secondary_menu() : array();
@@ -1986,6 +1986,7 @@ function template_preprocess_node(&$vari
  */
 function template_preprocess_block(&$variables) {
   static $block_counter = array();
+  $variables['block'] = $variables['elements'];
   // All blocks get an independent counter for each region.
   if (!isset($block_counter[$variables['block']->region])) {
     $block_counter[$variables['block']->region] = 1;
Index: includes/theme.maintenance.inc
===================================================================
RCS file: /Users/Shared/code/drupal/includes/theme.maintenance.inc,v
retrieving revision 1.15
diff -u -p -r1.15 theme.maintenance.inc
--- includes/theme.maintenance.inc	1 Jul 2008 20:36:40 -0000	1.15
+++ includes/theme.maintenance.inc	11 Aug 2008 18:47:14 -0000
@@ -164,7 +164,7 @@ function theme_update_page($content, $sh
   drupal_set_header('Content-Type: text/html; charset=utf-8');
 
   // Assign content and show message flag.
-  $variables['content'] = $content;
+  $variables['elements']['content'] = array('#value' => $content);
   $variables['show_messages'] = $show_messages;
   // The maintenance preprocess function is recycled here.
   template_preprocess_maintenance_page($variables);
@@ -239,6 +239,8 @@ function template_preprocess_maintenance
       $head_title[] = variable_get('site_slogan', '');
     }
   }
+
+  $variables['content']           = &$variables['elements']['content']);
   $variables['head_title']        = implode(' | ', $head_title);
   $variables['base_path']         = base_path();
   $variables['front_page']        = url();
Index: modules/contact/contact.test
===================================================================
RCS file: /Users/Shared/code/drupal/modules/contact/contact.test,v
retrieving revision 1.8
diff -u -p -r1.8 contact.test
--- modules/contact/contact.test	2 Aug 2008 05:16:47 -0000	1.8
+++ modules/contact/contact.test	11 Aug 2008 18:47:15 -0000
@@ -60,7 +60,7 @@ class ContactSitewideTestCase extends Dr
     $recipients = array('simpletest@example.com', 'simpletest2@example.com', 'simpletest3@example.com');
     $this->addCategory($category = $this->randomName(16), implode(',', array($recipients[0])), '', TRUE);
     $this->assertRaw(t('Category %category has been added.', array('%category' => $category)), t('Category successfully added.'));
-    
+
     // Test update contact form category
     $categories = $this->getCategories();
     $category_id = $this->updateCategory($categories, $category = $this->randomName(16), $recipients_str = implode(',', array($recipients[0], $recipients[1])), $reply = $this->randomName(30), FALSE);
@@ -70,7 +70,7 @@ class ContactSitewideTestCase extends Dr
     $this->assertEqual($category_array['reply'], $reply);
     $this->assertFalse($category_array['selected']);
     $this->assertRaw(t('Category %category has been updated.', array('%category' => $category)), t('Category successfully updated.'));
-		
+
     $this->addCategory($category = $this->randomName(16), implode(',', array($recipients[0], $recipients[1])), '', FALSE);
     $this->assertRaw(t('Category %category has been added.', array('%category' => $category)), t('Category successfully added.'));
 
Index: modules/dblog/dblog.admin.inc
===================================================================
RCS file: /Users/Shared/code/drupal/modules/dblog/dblog.admin.inc,v
retrieving revision 1.8
diff -u -p -r1.8 dblog.admin.inc
--- modules/dblog/dblog.admin.inc	19 Jul 2008 07:44:45 -0000	1.8
+++ modules/dblog/dblog.admin.inc	11 Aug 2008 21:21:50 -0000
@@ -51,7 +51,7 @@ function dblog_overview() {
     WATCHDOG_EMERG    => 'dblog-emerg',
   );
 
-  $output = drupal_get_form('dblog_filter_form');
+  $output['filter_form'] = drupal_get_form('dblog_filter_form');
 
   $header = array(
     ' ',
@@ -90,9 +90,14 @@ function dblog_overview() {
   if (!$rows) {
     $rows[] = array(array('data' => t('No log messages available.'), 'colspan' => 6));
   }
-
-  $output .= theme('table', $header, $rows, array('id' => 'admin-dblog'));
-  $output .= theme('pager', NULL, 50, 0);
+  $table = array(
+    '#type' => 'table',
+    '#header' => $header,
+    '#rows' => $rows,
+    '#attributes' => array('id' => 'admin-dblog'),
+  );
+  $output['messages_table'] = $table;
+  $output['pager'] = array('#markup' => theme('pager', NULL, 50, 0));
 
   return $output;
 }
@@ -118,8 +123,12 @@ function dblog_top($type) {
   if (empty($rows)) {
     $rows[] = array(array('data' => t('No log messages available.'), 'colspan' => 2));
   }
-
-  $output  = theme('table', $header, $rows);
+  $table = array(
+    '#type' => 'table',
+    '#header' => $header,
+    '#rows' => $rows,
+  );
+  $output  = theme('table', $table);
   $output .= theme('pager', NULL, 30, 0);
 
   return $output;
@@ -171,8 +180,13 @@ function dblog_event($id) {
         $dblog->link,
       ),
     );
-    $attributes = array('class' => 'dblog-event');
-    $output = theme('table', array(), $rows, $attributes);
+    $table = array(
+      '#type' => 'table',
+      '#header' => array(),
+      '#rows' => $rows,
+      '#attributes' => array('class' => 'dblog-event'),
+    );
+    $output = theme('table', $table);
   }
   return $output;
 }
Index: modules/system/system.admin.inc
===================================================================
RCS file: /Users/Shared/code/drupal/modules/system/system.admin.inc,v
retrieving revision 1.84
diff -u -p -r1.84 system.admin.inc
--- modules/system/system.admin.inc	9 Aug 2008 12:41:23 -0000	1.84
+++ modules/system/system.admin.inc	11 Aug 2008 19:55:05 -0000
@@ -1117,8 +1117,12 @@ function system_ip_blocking() {
   }
 
   $output .= drupal_get_form('system_ip_blocking_form');
-
-  $output .= theme('table', $header, $rows);
+  $table = array(
+    '#type' => 'table',
+    '#header' => $header,
+    '#rows' => $rows,
+  );
+  $output .= theme('table', $table);
 
   return $output;
 }
@@ -1823,8 +1827,12 @@ function _system_sql($data, $keys) {
       $rows[] = array(check_plain($key), check_plain($data[$key]), $explanation);
     }
   }
-
-  return theme('table', array(t('Variable'), t('Value'), t('Description')), $rows);
+  $table = array(
+    '#type' => 'table',
+    '#header' => array(t('Variable'), t('Value'), t('Description')),
+    '#rows' => $rows,
+  );
+  return theme('table', $table);
 }
 
 /**
@@ -2107,8 +2115,12 @@ function theme_system_modules_fieldset($
     $row[] = array('data' => $description, 'class' => 'description');
     $rows[] = $row;
   }
-
-  return theme('table', $form['#header'], $rows);
+  $table = array(
+    '#type' => 'table',
+    '#header' => $form['#header'],
+    '#rows' => $rows,
+  );
+  return theme('table', $table);
 }
 
 /**
@@ -2159,8 +2171,12 @@ function theme_system_modules_uninstall(
   if (empty($rows)) {
     $rows[] = array(array('data' => t('No modules are available to uninstall.'), 'colspan' => '3', 'align' => 'center', 'class' => 'message'));
   }
-
-  $output  = theme('table', $header, $rows);
+  $table = array(
+    '#type' => 'table',
+    '#header' => $header,
+    '#rows' => $rows,
+  );
+  $output  = theme('table', $table);
   $output .= drupal_render($form);
 
   return $output;
@@ -2183,8 +2199,12 @@ function theme_system_theme_select_form(
     $rows[] = $row;
   }
 
-  $header = array(t('Screenshot'), t('Name'), t('Selected'));
-  $output = theme('table', $header, $rows);
+  $table = array(
+    '#type' => 'table',
+    '#header' => array(t('Screenshot'), t('Name'), t('Selected')),
+    '#rows' => $rows,
+  );
+  $output = theme('table', $table);
   return $output;
 }
 
@@ -2241,8 +2261,12 @@ function theme_system_themes_form($form)
     $rows[] = $row;
   }
 
-  $header = array(t('Screenshot'), t('Name'), t('Version'), t('Enabled'), t('Default'), t('Operations'));
-  $output = theme('table', $header, $rows);
+  $table = array(
+    '#type' => 'table',
+    '#header' => array(t('Screenshot'), t('Name'), t('Version'), t('Enabled'), t('Default'), t('Operations')),
+    '#rows' => $rows,
+  );
+  $output = theme('table', $table);
   $output .= drupal_render($form);
   return $output;
 }
\ No newline at end of file
Index: modules/user/user.admin.inc
===================================================================
RCS file: /Users/Shared/code/drupal/modules/user/user.admin.inc,v
retrieving revision 1.24
diff -u -p -r1.24 user.admin.inc
--- modules/user/user.admin.inc	24 Jul 2008 16:28:52 -0000	1.24
+++ modules/user/user.admin.inc	11 Aug 2008 20:02:36 -0000
@@ -19,8 +19,8 @@ function user_admin($callback_arg = '') 
         $output = drupal_get_form('user_multiple_delete_confirm');
       }
       else {
-        $output = drupal_get_form('user_filter_form');
-        $output .= drupal_get_form('user_admin_account');
+        $output[] = drupal_get_form('user_filter_form');
+        $output[] = drupal_get_form('user_admin_account');
       }
   }
   return $output;
@@ -606,7 +606,13 @@ function theme_user_admin_perm($form) {
     }
   }
   $output = theme('system_compact_link');
-  $output .= theme('table', $header, $rows, array('id' => 'permissions'));
+  $table = array(
+    '#type' => 'table',
+    '#header' => $header,
+    '#rows' => $rows,
+    '#attributes' => array('id' => 'permissions'),
+  );
+  $output .= theme('table', $table);
   $output .= drupal_render($form);
   return $output;
 }
@@ -738,8 +744,12 @@ function theme_user_admin_account($form)
   else {
     $rows[] = array(array('data' => t('No users available.'), 'colspan' => '7'));
   }
-
-  $output .= theme('table', $header, $rows);
+  $table = array(
+    '#type' => 'table',
+    '#header' => $header,
+    '#rows' => $rows,
+  );
+  $output .= theme('table', $table);
   if ($form['pager']['#markup']) {
     $output .= drupal_render($form['pager']);
   }
@@ -768,7 +778,12 @@ function theme_user_admin_new_role($form
   $rows[] = array(drupal_render($form['name']), array('data' => drupal_render($form['submit']), 'colspan' => 2));
 
   $output = drupal_render($form);
-  $output .= theme('table', $header, $rows);
+  $table = array(
+    '#type' => 'table',
+    '#header' => $header,
+    '#rows' => $rows,
+  );
+  $output .= theme('table', $table);
 
   return $output;
 }
Index: modules/user/user.module
===================================================================
RCS file: /Users/Shared/code/drupal/modules/user/user.module,v
retrieving revision 1.914
diff -u -p -r1.914 user.module
--- modules/user/user.module	8 Aug 2008 19:48:43 -0000	1.914
+++ modules/user/user.module	11 Aug 2008 18:47:15 -0000
@@ -760,7 +760,7 @@ function user_block($op = 'list', $delta
         if (!$user->uid && !(arg(0) == 'user' && !is_numeric(arg(1)))) {
 
           $block['subject'] = t('User login');
-          $block['content'] = drupal_get_form('user_login_block');
+          $block['content'] = drupal_render(drupal_get_form('user_login_block'));
         }
         return $block;
 
Index: themes/garland/page.tpl.php
===================================================================
RCS file: /Users/Shared/code/drupal/themes/garland/page.tpl.php,v
retrieving revision 1.20
diff -u -p -r1.20 page.tpl.php
--- themes/garland/page.tpl.php	28 Apr 2008 09:25:27 -0000	1.20
+++ themes/garland/page.tpl.php	11 Aug 2008 19:34:52 -0000
@@ -14,7 +14,7 @@
   </head>
   <body class="<?php print $body_classes ?>">
 
-  <div id="header-region" class="clear-block"><?php print $header ?></div>
+  <div id="header-region" class="clear-block"><?php render($header) ?></div>
 
   <div id="wrapper">
     <div id="container" class="clear-block">
@@ -38,7 +38,7 @@
       <?php if ($left): ?>
         <div id="sidebar-left" class="sidebar">
           <?php if ($search_box): ?><div class="block block-theme"><?php print $search_box ?></div><?php endif; ?>
-          <?php print $left ?>
+          <?php render($left) ?>
         </div>
       <?php endif; ?>
 
@@ -52,16 +52,16 @@
           <?php if ($show_messages && $messages): print $messages; endif; ?>
           <?php print $help; ?>
           <div class="clear-block">
-            <?php print $content ?>
+            <?php render($content) ?>
           </div>
           <?php print $feed_icons ?>
-          <div id="footer"><?php print $footer_message . $footer ?></div>
+          <div id="footer"><?php print $footer_message; render($footer) ?></div>
       </div></div></div></div> <!-- /.left-corner, /.right-corner, /#squeeze, /#center -->
 
       <?php if ($right): ?>
         <div id="sidebar-right" class="sidebar">
           <?php if (!$left && $search_box): ?><div class="block block-theme"><?php print $search_box ?></div><?php endif; ?>
-          <?php print $right ?>
+          <?php render($right) ?>
         </div>
       <?php endif; ?>