### 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.16
diff -u -r1.16 node.tpl.php
--- modules/node/node.tpl.php	30 Jun 2009 17:18:10 -0000	1.16
+++ modules/node/node.tpl.php	10 Jul 2009 22:17:14 -0000
@@ -91,12 +91,12 @@
       // We hide the comments and links now so that we can render them later.
       hide($content['comments']);
       hide($content['links']);
-      render($content);
+      print render($content);
     ?>
   </div>
 
-  <?php render($content['links']); ?>
+  <?php print render($content['links']); ?>
 
-  <?php render($content['comments']); ?>
+  <?php print render($content['comments']); ?>
 
 </div>
Index: modules/field/field.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/field/field.module,v
retrieving revision 1.17
diff -u -r1.17 field.module
--- modules/field/field.module	7 Jul 2009 09:28:07 -0000	1.17
+++ modules/field/field.module	10 Jul 2009 22:17:14 -0000
@@ -477,7 +477,7 @@
  * Return a single field, fully themed with label and multiple values.
  *
  * To be used by third-party code (Views, Panels...) that needs to output
- * an isolated field. Do *not* use inside node templates, use the
+ * an isolated field. Do *not* use inside node templates, use
  * render($content[FIELD_NAME]) instead.
  *
  * The field will be displayed using the display options (label display,
Index: modules/user/user-profile.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user-profile.tpl.php,v
retrieving revision 1.9
diff -u -r1.9 user-profile.tpl.php
--- modules/user/user-profile.tpl.php	24 Jun 2009 18:16:38 -0000	1.9
+++ modules/user/user-profile.tpl.php	10 Jul 2009 22:17:14 -0000
@@ -28,5 +28,5 @@
  */
 ?>
 <div class="profile">
-  <?php render($user_profile); ?>
+  <?php print render($user_profile); ?>
 </div>
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.932
diff -u -r1.932 common.inc
--- includes/common.inc	10 Jul 2009 05:45:56 -0000	1.932
+++ includes/common.inc	10 Jul 2009 22:17:14 -0000
@@ -3838,7 +3838,7 @@
       }
     }
   }
-  
+
   // Add additional CSS and JavaScript files associated with this element.
   foreach (array('css', 'js') as $kind) {
     if (!empty($elements['#attached_' . $kind]) && is_array($elements['#attached_' . $kind])) {
@@ -3894,13 +3894,11 @@
 /**
  * Render and print an element.
  *
- * This function renders an element using drupal_render() and then prints out
- * the rendered output. The top level element is always rendered and printed
- * even if hide() had been previously used on it.
- *
- * Any nested elements are only printed if they haven't been printed before or
- * if they have been re-enabled with show(). If the element is a string instead
- * of a renderable array it is also printed.
+ * This function renders an element using drupal_render(). The top level
+ * element is always rendered even if hide() had been previously used on it.
+ *
+ * Any nested elements are only rendered if they haven't been rendered before
+ * or if they have been re-enabled with show().
  *
  * @see drupal_render()
  * @see show()
@@ -3909,10 +3907,12 @@
 function render(&$element) {
   if (is_array($element)) {
     show($element);
-    print drupal_render($element);
+    return drupal_render($element);
   }
   else {
-    print $element;
+    // Safe-guard for inappropriate use of render() on flat variables: return
+    // the variable as-is.
+    return $element;
   }
 }
 
@@ -3931,7 +3931,7 @@
  * Show a hidden or already printed element from later rendering.
  *
  * Alternatively, render($element) could be used which automatically shows the
- * element while rendering and printing it.
+ * element while rendering it.
  *
  * @see render()
  * @see hide()
Index: themes/garland/node.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/node.tpl.php,v
retrieving revision 1.11
diff -u -r1.11 node.tpl.php
--- themes/garland/node.tpl.php	18 Jun 2009 21:19:02 -0000	1.11
+++ themes/garland/node.tpl.php	10 Jul 2009 22:17:14 -0000
@@ -13,21 +13,21 @@
   <?php endif; ?>
 
   <div class="content clearfix">
-    <?php hide($content['links']); hide($content['comments']); render($content); ?>
+    <?php hide($content['links']); hide($content['comments']); print render($content); ?>
   </div>
 
   <div class="clearfix">
     <div class="meta">
     <?php if (!empty($content['links']['terms'])): ?>
-      <div class="terms"><?php render($content['links']['terms']) ?></div>
+      <div class="terms"><?php print render($content['links']['terms']) ?></div>
     <?php endif;?>
     </div>
 
     <?php if (!empty($content['links'])): ?>
-      <div class="links"><?php render($content['links']) ?></div>
+      <div class="links"><?php print render($content['links']) ?></div>
     <?php endif; ?>
 
-    <?php render($content['comments']); ?>
+    <?php print render($content['comments']); ?>
 
   </div>