### 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 14 May 2009 19:14:48 -0000 @@ -68,7 +68,7 @@
- +
Index: includes/theme.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/theme.inc,v retrieving revision 1.485 diff -u -r1.485 theme.inc --- includes/theme.inc 14 May 2009 08:23:14 -0000 1.485 +++ includes/theme.inc 14 May 2009 19:14:48 -0000 @@ -1942,8 +1942,15 @@ // 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); + // TEST CODE, DO NOT COMMIT + $node->content['test'] = array( + '#markup' => 'foo', + '#weight' => 300, + ); + $node->content['test2'] = array( + '#markup' => 'bar', + '#weight' => 301, + ); // Flatten the node object's member fields. $variables = array_merge((array)$node, $variables); Index: includes/common.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/common.inc,v retrieving revision 1.900 diff -u -r1.900 common.inc --- includes/common.inc 14 May 2009 08:23:14 -0000 1.900 +++ includes/common.inc 14 May 2009 19:14:47 -0000 @@ -3416,6 +3416,13 @@ } /** + * 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 14 May 2009 19:14:48 -0000 @@ -14,7 +14,9 @@
- + + +