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()
*/
?>
-
+
subject): ?>
-
subject ?>
+
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 29 Jun 2009 23:11:43 -0000
@@ -45,19 +45,19 @@
$title): ?>
-
- |
+
+ |
-
+
|
$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 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 @@
*/
?>
-
-
+
+
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 @@
*/
?>
$menu) : ?>
-