Index: modules/node/node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.module,v retrieving revision 1.1090 diff -u -p -r1.1090 node.module --- modules/node/node.module 31 Jul 2009 19:01:02 -0000 1.1090 +++ modules/node/node.module 3 Aug 2009 06:31:22 -0000 @@ -1225,11 +1225,11 @@ function template_preprocess_node(&$vari // Display post information only on certain node types. if (variable_get('node_submitted_' . $node->type, TRUE)) { $variables['submitted'] = theme('node_submitted', $node); - $variables['picture'] = theme_get_setting('toggle_node_user_picture') ? theme('user_picture', $node) : ''; + $variables['user_picture'] = theme_get_setting('toggle_node_user_picture') ? theme('user_picture', $node) : ''; } else { $variables['submitted'] = ''; - $variables['picture'] = ''; + $variables['user_picture'] = ''; } // Gather node classes. Index: modules/node/node.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.tpl.php,v retrieving revision 1.18 diff -u -p -r1.18 node.tpl.php --- modules/node/node.tpl.php 23 Jul 2009 22:12:53 -0000 1.18 +++ modules/node/node.tpl.php 3 Aug 2009 06:31:22 -0000 @@ -11,8 +11,7 @@ * print a subset such as render($content['field_example']). Use * hide($content['field_example']) to temporarily suppress the printing of a * given element. - * - $picture: The authors picture of the node output from - * theme_user_picture(). + * - $user_picture: The node author's picture. * - $date: Formatted creation date (use $created to reformat with * format_date()). * - $name: Themed username of node author output from theme_username(). @@ -65,23 +64,25 @@ * @see template_process() */ ?> -
+
- + - -

- - -
- - + +

- -
- -
+ +
+ + + + + +
+ +
+
-
+
\ No newline at end of file Index: modules/user/user-picture.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user-picture.tpl.php,v retrieving revision 1.4 diff -u -p -r1.4 user-picture.tpl.php --- modules/user/user-picture.tpl.php 24 Apr 2009 09:03:21 -0000 1.4 +++ modules/user/user-picture.tpl.php 3 Aug 2009 06:31:22 -0000 @@ -7,7 +7,7 @@ * user's account. * * Available variables: - * - $picture: Image set by the user or the site's default. Will be linked + * - $user_picture: Image set by the user or the site's default. Will be linked * depending on the viewer's permission to view the users profile page. * - $account: Array of account information. Potentially unsafe. Be sure to * check_plain() before use. @@ -15,8 +15,8 @@ * @see template_preprocess_user_picture() */ ?> - -
- + +
+
Index: modules/user/user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.module,v retrieving revision 1.1015 diff -u -p -r1.1015 user.module --- modules/user/user.module 31 Jul 2009 19:01:03 -0000 1.1015 +++ modules/user/user.module 3 Aug 2009 06:31:23 -0000 @@ -1153,7 +1153,7 @@ function user_block_view($delta = '') { * @see user-picture.tpl.php */ function template_preprocess_user_picture(&$variables) { - $variables['picture'] = ''; + $variables['user_picture'] = ''; if (variable_get('user_pictures', 0)) { $account = $variables['account']; if (!empty($account->picture)) { @@ -1177,14 +1177,14 @@ function template_preprocess_user_pictur if (isset($filepath)) { $alt = t("@user's picture", array('@user' => $account->name ? $account->name : variable_get('anonymous', t('Anonymous')))); if (module_exists('image') && $style = variable_get('user_picture_style', '')) { - $variables['picture'] = theme('image_style', $style, $filepath, $alt, $alt, array(), FALSE); + $variables['user_picture'] = theme('image_style', $style, $filepath, $alt, $alt, array(), FALSE); } else { - $variables['picture'] = theme('image', $filepath, $alt, $alt, array(), FALSE); + $variables['user_picture'] = theme('image', $filepath, $alt, $alt, array(), FALSE); } if (!empty($account->uid) && user_access('access user profiles')) { $attributes = array('attributes' => array('title' => t('View user profile.')), 'html' => TRUE); - $variables['picture'] = l($variables['picture'], "user/$account->uid", $attributes); + $variables['user_picture'] = l($variables['user_picture'], "user/$account->uid", $attributes); } } } Index: themes/garland/style-rtl.css =================================================================== RCS file: /cvs/drupal/drupal/themes/garland/style-rtl.css,v retrieving revision 1.14 diff -u -p -r1.14 style-rtl.css --- themes/garland/style-rtl.css 3 Aug 2009 03:04:34 -0000 1.14 +++ themes/garland/style-rtl.css 3 Aug 2009 06:31:23 -0000 @@ -206,7 +206,7 @@ ul.links li, ul.inline li { padding-left: 0; } -.picture, .comment .submitted { +.user-picture, .comment .submitted { padding-left: 0; float: left; clear: left; Index: themes/garland/style.css =================================================================== RCS file: /cvs/drupal/drupal/themes/garland/style.css,v retrieving revision 1.60 diff -u -p -r1.60 style.css --- themes/garland/style.css 3 Aug 2009 03:04:34 -0000 1.60 +++ themes/garland/style.css 3 Aug 2009 06:31:24 -0000 @@ -673,7 +673,8 @@ ul.links li, ul.inline li { padding-left: 1em; } -.picture, .comment .submitted { +.picture, +.comment .submitted { float: right; /* LTR */ clear: right; /* LTR */ padding-left: 1em; /* LTR */