### Eclipse Workspace Patch 1.0
#P drupal_test_7
Index: modules/node/node.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.tpl.php,v
retrieving revision 1.11
diff -u -r1.11 node.tpl.php
--- modules/node/node.tpl.php	28 Apr 2009 19:56:00 -0000	1.11
+++ modules/node/node.tpl.php	15 May 2009 22:19:34 -0000
@@ -8,6 +8,7 @@
  * Available variables:
  * - $title: the (sanitized) title of the node.
  * - $content: Node body or teaser depending on $teaser flag.
+ *   TODO more accurate descitption + document the r() bit.
  * - $comments: the themed list of comments (if any).
  * - $picture: The authors picture of the node output from
  *   theme_user_picture().
@@ -68,7 +69,7 @@
   </div>
 
   <div class="content">
-    <?php print $content ?>
+    <?php print r($content); ?>
   </div>
 
   <?php print $links; ?>
Index: modules/user/user.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.pages.inc,v
retrieving revision 1.35
diff -u -r1.35 user.pages.inc
--- modules/user/user.pages.inc	6 May 2009 11:31:44 -0000	1.35
+++ modules/user/user.pages.inc	15 May 2009 22:19:34 -0000
@@ -189,16 +189,7 @@
  */
 function template_preprocess_user_profile(&$variables) {
   $account = $variables['elements']['#account'];
-  
-  $variables['profile'] = array();
-  // Sort sections by weight
-  uasort($account->content, 'element_sort');
-  // Provide keyed variables so themers can print each section independently.
-  foreach (element_children($account->content) as $key) {
-    $variables['profile'][$key] = drupal_render($account->content[$key]);
-  }
-  // Collect all profiles to make it easier to print all items at once.
-  $variables['user_profile'] = implode($variables['profile']);
+  $variables['user_profile'] = $account->content;
 
   // Add $FIELD_NAME_rendered variables for fields.
   $variables += field_attach_preprocess('user', $account);
Index: modules/user/user-profile.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user-profile.tpl.php,v
retrieving revision 1.6
diff -u -r1.6 user-profile.tpl.php
--- modules/user/user-profile.tpl.php	5 Feb 2009 03:42:58 -0000	1.6
+++ modules/user/user-profile.tpl.php	15 May 2009 22:19:34 -0000
@@ -37,13 +37,12 @@
  *
  * Available variables:
  *   - $user_profile: All user profile data. Ready for print.
- *   - $profile: Keyed array of profile categories and their items or other data
- *     provided by modules.
+ *     TODO: more accurate description + document the r() bit.
  *   - TODO D7 : document $FIELD_NAME_rendered variables.
  *
  * @see template_preprocess_user_profile()
  */
 ?>
 <div class="profile">
-  <?php print $user_profile; ?>
+  <?php print r($user_profile); ?>
 </div>
Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.485
diff -u -r1.485 theme.inc
--- includes/theme.inc	14 May 2009 08:23:14 -0000	1.485
+++ includes/theme.inc	15 May 2009 22:19:34 -0000
@@ -1942,9 +1942,6 @@
   // Render any comments.
   $variables['comments']  = !empty($node->content['comments']) ? drupal_render($node->content['comments']) : '';
 
-  // Render the rest of the node into $content.
-  $variables['content'] = drupal_render($node->content);
-
   // Flatten the node object's member fields.
   $variables = array_merge((array)$node, $variables);
 
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.900
diff -u -r1.900 common.inc
--- includes/common.inc	14 May 2009 08:23:14 -0000	1.900
+++ includes/common.inc	15 May 2009 22:19:33 -0000
@@ -3416,6 +3416,13 @@
 }
 
 /**
+ * Shortcut for drupal_render(), to be used in templates.
+ */
+function r(&$element) {
+  return drupal_render($element);
+}
+
+/**
  * Function used by uasort to sort structured arrays by weight.
  */
 function element_sort($a, $b) {
Index: themes/garland/node.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/node.tpl.php,v
retrieving revision 1.9
diff -u -r1.9 node.tpl.php
--- themes/garland/node.tpl.php	18 Feb 2009 14:28:25 -0000	1.9
+++ themes/garland/node.tpl.php	15 May 2009 22:19:34 -0000
@@ -14,7 +14,7 @@
   <?php endif; ?>
 
   <div class="content clearfix">
-    <?php print $content ?>
+    <?php print r($content); ?>
   </div>
 
   <div class="clearfix">