### Eclipse Workspace Patch 1.0
#P drupal_test_7
Index: modules/aggregator/aggregator-feed-source.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator-feed-source.tpl.php,v
retrieving revision 1.2
diff -u -r1.2 aggregator-feed-source.tpl.php
--- modules/aggregator/aggregator-feed-source.tpl.php	15 May 2008 21:27:32 -0000	1.2
+++ modules/aggregator/aggregator-feed-source.tpl.php	29 Jun 2009 23:11:43 -0000
@@ -21,15 +21,15 @@
  */
 ?>
 <div class="feed-source">
-  <?php print $source_icon; ?>
-  <?php print $source_image; ?>
+  <?php p($source_icon); ?>
+  <?php p($source_image); ?>
   <div class="feed-description">
-    <?php print $source_description; ?>
+    <?php p($source_description); ?>
   </div>
   <div class="feed-url">
-    <em><?php print t('URL:'); ?></em> <a href="<?php print $source_url; ?>"><?php print $source_url; ?></a>
+    <em><?php print t('URL:'); ?></em> <a href="<?php p($source_url); ?>"><?php p($source_url); ?></a>
   </div>
   <div class="feed-updated">
-    <em><?php print t('Updated:'); ?></em> <?php print $last_checked; ?>
+    <em><?php print t('Updated:'); ?></em> <?php p($last_checked); ?>
   </div>
 </div>
Index: modules/aggregator/aggregator-wrapper.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator-wrapper.tpl.php,v
retrieving revision 1.2
diff -u -r1.2 aggregator-wrapper.tpl.php
--- modules/aggregator/aggregator-wrapper.tpl.php	15 May 2008 21:27:32 -0000	1.2
+++ modules/aggregator/aggregator-wrapper.tpl.php	29 Jun 2009 23:11:43 -0000
@@ -14,6 +14,6 @@
  */
 ?>
 <div id="aggregator">
-  <?php print $content; ?>
-  <?php print $pager; ?>
+  <?php p($content); ?>
+  <?php p($pager); ?>
 </div>
Index: modules/aggregator/aggregator-summary-items.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator-summary-items.tpl.php,v
retrieving revision 1.3
diff -u -r1.3 aggregator-summary-items.tpl.php
--- modules/aggregator/aggregator-summary-items.tpl.php	3 Aug 2008 16:10:50 -0000	1.3
+++ modules/aggregator/aggregator-summary-items.tpl.php	29 Jun 2009 23:11:43 -0000
@@ -17,8 +17,8 @@
  * @see template_preprocess_aggregator_summary-items()
  */
 ?>
-<h3><?php print $title; ?></h3>
-<?php print $summary_list; ?>
+<h3><?php p($title); ?></h3>
+<?php p($summary_list); ?>
 <div class="links">
-  <a href="<?php print $source_url; ?>"><?php print t('More'); ?></a>
+  <a href="<?php p($source_url); ?>"><?php print t('More'); ?></a>
 </div>
Index: modules/aggregator/aggregator-summary-item.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator-summary-item.tpl.php,v
retrieving revision 1.2
diff -u -r1.2 aggregator-summary-item.tpl.php
--- modules/aggregator/aggregator-summary-item.tpl.php	15 May 2008 21:27:32 -0000	1.2
+++ modules/aggregator/aggregator-summary-item.tpl.php	29 Jun 2009 23:11:43 -0000
@@ -16,9 +16,9 @@
  * @see template_preprocess_aggregator_summary_item()
  */
 ?>
-<a href="<?php print $feed_url; ?>"><?php print $feed_title; ?></a>
-<span class="age"><?php print $feed_age; ?></span>
+<a href="<?php p($feed_url); ?>"><?php p($feed_title); ?></a>
+<span class="age"><?php p($feed_age); ?></span>
 
 <?php if ($source_url) : ?>,
-<span class="source"><a href="<?php print $source_url; ?>"><?php print $source_title; ?></a></span>
+<span class="source"><a href="<?php p($source_url); ?>"><?php p($source_title); ?></a></span>
 <?php endif; ?>
Index: modules/aggregator/aggregator-item.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator/aggregator-item.tpl.php,v
retrieving revision 1.2
diff -u -r1.2 aggregator-item.tpl.php
--- modules/aggregator/aggregator-item.tpl.php	15 May 2008 21:27:32 -0000	1.2
+++ modules/aggregator/aggregator-item.tpl.php	29 Jun 2009 23:11:43 -0000
@@ -21,19 +21,19 @@
 ?>
 <div class="feed-item">
   <h3 class="feed-item-title">
-    <a href="<?php print $feed_url; ?>"><?php print $feed_title; ?></a>
+    <a href="<?php p($feed_url); ?>"><?php p($feed_title); ?></a>
   </h3>
 
   <div class="feed-item-meta">
   <?php if ($source_url) : ?>
-    <a href="<?php print $source_url; ?>" class="feed-item-source"><?php print $source_title; ?></a> -
+    <a href="<?php p($source_url); ?>" class="feed-item-source"><?php p($source_title); ?></a> -
   <?php endif; ?>
-    <span class="feed-item-date"><?php print $source_date; ?></span>
+    <span class="feed-item-date"><?php p($source_date); ?></span>
   </div>
 
 <?php if ($content) : ?>
   <div class="feed-item-body">
-    <?php print $content; ?>
+    <?php p($content); ?>
   </div>
 <?php endif; ?>
 
Index: modules/block/block.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block.tpl.php,v
retrieving revision 1.3
diff -u -r1.3 block.tpl.php
--- modules/block/block.tpl.php	12 Jun 2009 09:02:55 -0000	1.3
+++ modules/block/block.tpl.php	29 Jun 2009 23:11:43 -0000
@@ -35,12 +35,12 @@
  * @see template_process()
  */
 ?>
-<div id="block-<?php print $block->module . '-' . $block->delta; ?>" class="<?php print $classes; ?>">
+<div id="block-<?php print $block->module . '-' . $block->delta; ?>" class="<?php p($classes); ?>">
 <?php if ($block->subject): ?>
-  <h2><?php print $block->subject ?></h2>
+  <h2><?php p($block->subject); ?></h2>
 <?php endif;?>
 
   <div class="content">
-    <?php print $content ?>
+    <?php p($content); ?>
   </div>
 </div>
Index: modules/block/block-admin-display-form.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/block/block-admin-display-form.tpl.php,v
retrieving revision 1.6
diff -u -r1.6 block-admin-display-form.tpl.php
--- modules/block/block-admin-display-form.tpl.php	15 May 2008 21:30:02 -0000	1.6
+++ modules/block/block-admin-display-form.tpl.php	29 Jun 2009 23:11:43 -0000
@@ -45,19 +45,19 @@
   <tbody>
     <?php $row = 0; ?>
     <?php foreach ($block_regions as $region => $title): ?>
-      <tr class="region region-<?php print $region?>">
-        <td colspan="5" class="region"><?php print $title; ?></td>
+      <tr class="region region-<?php p($region); ?>">
+        <td colspan="5" class="region"><?php p($title); ?></td>
       </tr>
-      <tr class="region-message region-<?php print $region?>-message <?php print empty($block_listing[$region]) ? 'region-empty' : 'region-populated'; ?>">
+      <tr class="region-message region-<?php p($region); ?>-message <?php print empty($block_listing[$region]) ? 'region-empty' : 'region-populated'; ?>">
         <td colspan="5"><em><?php print t('No blocks in this region'); ?></em></td>
       </tr>
       <?php foreach ($block_listing[$region] as $delta => $data): ?>
       <tr class="draggable <?php print $row % 2 == 0 ? 'odd' : 'even'; ?><?php print $data->row_class ? ' ' . $data->row_class : ''; ?>">
-        <td class="block"><?php print $data->block_title; ?></td>
-        <td><?php print $data->region_select; ?></td>
-        <td><?php print $data->weight_select; ?></td>
-        <td><?php print $data->configure_link; ?></td>
-        <td><?php print $data->delete_link; ?></td>
+        <td class="block"><?php p($data->block_title); ?></td>
+        <td><?php p($data->region_select); ?></td>
+        <td><?php p($data->weight_select); ?></td>
+        <td><?php p($data->configure_link); ?></td>
+        <td><?php p($data->delete_link); ?></td>
       </tr>
       <?php $row++; ?>
       <?php endforeach; ?>
@@ -65,4 +65,4 @@
   </tbody>
 </table>
 
-<?php print $form_submit; ?>
+<?php p($form_submit); ?>
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.925
diff -u -r1.925 common.inc
--- includes/common.inc	18 Jun 2009 21:19:01 -0000	1.925
+++ includes/common.inc	29 Jun 2009 23:11:43 -0000
@@ -3748,8 +3748,9 @@
 }
 
 /**
- * Render and print an element.
+ * Print an element, rendering it first if necessary.
  *
+ * TODO
  * 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.
@@ -3762,20 +3763,25 @@
  * @see show()
  * @see hide()
  */
-function render(&$element) {
+function p(&$element, $return = FALSE) {
+  $output = $element;
   if (is_array($element)) {
     show($element);
-    print drupal_render($element);
+    $output = drupal_render($element);
+  }
+
+  if ($return) {
+    return $output;
   }
   else {
-    print $element;
+    print $output;
   }
 }
 
 /**
  * Hide an element from later rendering.
  *
- * @see render()
+ * @see p()
  * @see show()
  */
 function hide(&$element) {
@@ -3786,10 +3792,10 @@
 /**
  * Show a hidden or already printed element from later rendering.
  *
- * Alternatively, render($element) could be used which automatically shows the
+ * Alternatively, p($element) could be used which automatically shows the
  * element while rendering and printing it.
  *
- * @see render()
+ * @see p()
  * @see hide()
  */
 function show(&$element) {
Index: modules/book/book-navigation.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book-navigation.tpl.php,v
retrieving revision 1.3
diff -u -r1.3 book-navigation.tpl.php
--- modules/book/book-navigation.tpl.php	18 Feb 2009 14:28:21 -0000	1.3
+++ modules/book/book-navigation.tpl.php	29 Jun 2009 23:11:43 -0000
@@ -31,19 +31,19 @@
  */
 ?>
 <?php if ($tree || $has_links): ?>
-  <div id="book-navigation-<?php print $book_id; ?>" class="book-navigation">
-    <?php print $tree; ?>
+  <div id="book-navigation-<?php p($book_id); ?>" class="book-navigation">
+    <?php p($tree); ?>
 
     <?php if ($has_links): ?>
     <div class="page-links clearfix">
       <?php if ($prev_url) : ?>
-        <a href="<?php print $prev_url; ?>" class="page-previous" title="<?php print t('Go to previous page'); ?>"><?php print t('‹ ') . $prev_title; ?></a>
+        <a href="<?php p($prev_url); ?>" class="page-previous" title="<?php print t('Go to previous page'); ?>"><?php print t('‹ ') . $prev_title; ?></a>
       <?php endif; ?>
       <?php if ($parent_url) : ?>
-        <a href="<?php print $parent_url; ?>" class="page-up" title="<?php print t('Go to parent page'); ?>"><?php print t('up'); ?></a>
+        <a href="<?php p($parent_url); ?>" class="page-up" title="<?php print t('Go to parent page'); ?>"><?php print t('up'); ?></a>
       <?php endif; ?>
       <?php if ($next_url) : ?>
-        <a href="<?php print $next_url; ?>" class="page-next" title="<?php print t('Go to next page'); ?>"><?php print $next_title . t(' ›'); ?></a>
+        <a href="<?php p($next_url); ?>" class="page-next" title="<?php print t('Go to next page'); ?>"><?php print $next_title . t(' ›'); ?></a>
       <?php endif; ?>
     </div>
     <?php endif; ?>
Index: modules/book/book-all-books-block.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book-all-books-block.tpl.php,v
retrieving revision 1.3
diff -u -r1.3 book-all-books-block.tpl.php
--- modules/book/book-all-books-block.tpl.php	8 Apr 2009 03:23:46 -0000	1.3
+++ modules/book/book-all-books-block.tpl.php	29 Jun 2009 23:11:43 -0000
@@ -14,7 +14,7 @@
  */
 ?>
 <?php foreach ($book_menus as $book_id => $menu) : ?>
-<div id="book-block-menu-<?php print $book_id; ?>" class="book-block-menu">
-  <?php print $menu; ?>
+<div id="book-block-menu-<?php p($book_id); ?>" class="book-block-menu">
+  <?php p($menu); ?>
 </div>
 <?php endforeach; ?>
Index: modules/book/book-export-html.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book-export-html.tpl.php,v
retrieving revision 1.2
diff -u -r1.2 book-export-html.tpl.php
--- modules/book/book-export-html.tpl.php	15 May 2008 21:19:24 -0000	1.2
+++ modules/book/book-export-html.tpl.php	29 Jun 2009 23:11:43 -0000
@@ -18,11 +18,11 @@
  */
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="<?php print $language->language; ?>" xml:lang="<?php print $language->language; ?>">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="<?php p($language->language); ?>" xml:lang="<?php p($language->language); ?>">
   <head>
-    <title><?php print $title; ?></title>
-    <?php print $head; ?>
-    <base href="<?php print $base_url; ?>" />
+    <title><?php p($title); ?></title>
+    <?php p($head); ?>
+    <base href="<?php p($base_url); ?>" />
     <link type="text/css" rel="stylesheet" href="misc/print.css" />
     <?php if ($language_rtl): ?>
       <link type="text/css" rel="stylesheet" href="misc/print-rtl.css" />
@@ -42,10 +42,10 @@
     $div_close = '';
     ?>
     <?php for ($i = 1; $i < $depth; $i++) : ?>
-      <div class="section-<?php print $i; ?>">
+      <div class="section-<?php p($i); ?>">
       <?php $div_close .= '</div>'; ?>
     <?php endfor; ?>
-    <?php print $contents; ?>
-    <?php print $div_close; ?>
+    <?php p($contents); ?>
+    <?php p($div_close); ?>
   </body>
 </html>
Index: modules/book/book-node-export-html.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/book/book-node-export-html.tpl.php,v
retrieving revision 1.2
diff -u -r1.2 book-node-export-html.tpl.php
--- modules/book/book-node-export-html.tpl.php	15 May 2008 21:19:24 -0000	1.2
+++ modules/book/book-node-export-html.tpl.php	29 Jun 2009 23:11:43 -0000
@@ -18,8 +18,8 @@
  * @see template_preprocess_book_node_export_html()
  */
 ?>
-<div id="node-<?php print $node->nid; ?>" class="section-<?php print $depth; ?>">
-  <h1 class="book-heading"><?php print $title; ?></h1>
-  <?php print $content; ?>
-  <?php print $children; ?>
+<div id="node-<?php p($node->nid); ?>" class="section-<?php p($depth); ?>">
+  <h1 class="book-heading"><?php p($title); ?></h1>
+  <?php p($content); ?>
+  <?php p($children); ?>
 </div>
Index: modules/node/node.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.tpl.php,v
retrieving revision 1.15
diff -u -r1.15 node.tpl.php
--- modules/node/node.tpl.php	24 Jun 2009 18:16:38 -0000	1.15
+++ modules/node/node.tpl.php	29 Jun 2009 23:11:44 -0000
@@ -68,21 +68,21 @@
  * @see template_process()
  */
 ?>
-<div id="node-<?php print $node->nid; ?>" class="<?php print $classes ?> clearfix">
+<div id="node-<?php p($node->nid); ?>" class="<?php p($classes); ?> clearfix">
 
-<?php print $picture ?>
+<?php p($picture); ?>
 
 <?php if (!$page): ?>
-  <h2><a href="<?php print $node_url ?>"><?php print $title ?></a></h2>
+  <h2><a href="<?php p($node_url); ?>"><?php p($title); ?></a></h2>
 <?php endif; ?>
 
   <div class="meta">
   <?php if ($submitted): ?>
-    <span class="submitted"><?php print $submitted ?></span>
+    <span class="submitted"><?php p($submitted); ?></span>
   <?php endif; ?>
 
   <?php if (!empty($content['links']['terms'])): ?>
-    <div class="terms terms-inline"><?php render($content['links']['terms']) ?></div>
+    <div class="terms terms-inline"><?php p($content['links']['terms']) ?></div>
   <?php endif;?>
   </div>
 
@@ -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);
+      p($content);
     ?>
   </div>
 
-  <?php render($content['links']); ?>
+  <?php p($content['links']); ?>
 
-  <?php render($content['comments']); ?>
+  <?php p($content['comments']); ?>
 
 </div>
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	29 Jun 2009 23:11:44 -0000
@@ -28,5 +28,5 @@
  */
 ?>
 <div class="profile">
-  <?php render($user_profile); ?>
+  <?php p($user_profile); ?>
 </div>