-
-
-
-
+
+
+
+
-
+
-
+
@@ -187,12 +187,12 @@
-
+
-
+
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 1 Jul 2009 00:37:04 -0000
@@ -21,15 +21,15 @@
*/
?>
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 1 Jul 2009 00:37:04 -0000
@@ -14,6 +14,6 @@
*/
?>
-
+
@@ -153,33 +153,33 @@
-
+
-
+
-
-
+
+
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 1 Jul 2009 00:37:04 -0000
@@ -17,8 +17,8 @@
* @see template_preprocess_aggregator_summary-items()
*/
?>
-
-
+
+
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 1 Jul 2009 00:37:04 -0000
@@ -16,9 +16,9 @@
* @see template_preprocess_aggregator_summary_item()
*/
?>
-
-
+
+
,
-
+
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 1 Jul 2009 00:37:04 -0000
@@ -21,19 +21,19 @@
?>
- +
-
+
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 1 Jul 2009 00:37:04 -0000
@@ -35,12 +35,12 @@
* @see template_process()
*/
?>
-
+
-
+
-
$data): ?>
- block_title; ?>
- region_select; ?>
- weight_select; ?>
- configure_link; ?>
- delete_link; ?>
+ block_title); ?>
+ region_select); ?>
+ weight_select); ?>
+ configure_link); ?>
+ delete_link); ?>
@@ -65,4 +65,4 @@
-
+
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 1 Jul 2009 00:37:04 -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: 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 1 Jul 2009 00:37:04 -0000
@@ -13,21 +13,21 @@
subject): ?>
-
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 1 Jul 2009 00:37:04 -0000
@@ -45,19 +45,19 @@
$title): ?>
- subject ?>
+subject); ?>
-
+
-
+
-
+
-
+
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 1 Jul 2009 00:37:04 -0000
@@ -68,21 +68,21 @@
* @see template_process()
*/
?>
-
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 1 Jul 2009 00:37:04 -0000
@@ -14,7 +14,7 @@
*/
?>
$menu) : ?>
-