### 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 26 May 2009 23:21:01 -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 descritption + 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 @@
-
+
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1058
diff -u -r1.1058 node.module
--- modules/node/node.module 26 May 2009 09:13:47 -0000 1.1058
+++ modules/node/node.module 26 May 2009 23:21:01 -0000
@@ -1372,9 +1372,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: modules/user/user.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.pages.inc,v
retrieving revision 1.38
diff -u -r1.38 user.pages.inc
--- modules/user/user.pages.inc 25 May 2009 18:22:31 -0000 1.38
+++ modules/user/user.pages.inc 26 May 2009 23:21:01 -0000
@@ -185,20 +185,11 @@
* The $variables array contains the following arguments:
* - $account
*
- * @see user-picture.tpl.php
+ * @see user-profile.tpl.php
*/
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 26 May 2009 23:21:01 -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()
*/
?>
-
+
Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.912
diff -u -r1.912 common.inc
--- includes/common.inc 26 May 2009 09:12:28 -0000 1.912
+++ includes/common.inc 26 May 2009 23:20:59 -0000
@@ -3708,6 +3708,13 @@
}
/**
+ * Temporary 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 26 May 2009 23:21:01 -0000
@@ -14,7 +14,7 @@
-
+