#382870 by geerlingguy, jmburnz, EclipseGc, JohnAlbin, sun, et al: Update and Polish default node.tpl.php output.

4 files changed, 10 insertions, 10 deletions

diff --git a/modules/user/user-picture.tpl.php b/modules/user/user-picture.tpl.php
index c0f7e1ac7..328f9c1ba 100644
--- a/modules/user/user-picture.tpl.php
+++ b/modules/user/user-picture.tpl.php
@@ -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()
  */
 ?>
-<?php if ($picture): ?>
-  <div class="picture">
-    <?php print $picture; ?>
+<?php if ($user_picture): ?>
+  <div class="user-picture">
+    <?php print $user_picture; ?>
   </div>
 <?php endif; ?>
diff --git a/modules/user/user-rtl.css b/modules/user/user-rtl.css
index 219b0cf7c..ed3f23aa8 100644
--- a/modules/user/user-rtl.css
+++ b/modules/user/user-rtl.css
@@ -11,7 +11,7 @@
   clear: left;
 }
 
-.profile .picture {
+.profile .user-picture {
   float: left;
   margin: 0 0 1em 1em;
 }
diff --git a/modules/user/user.css b/modules/user/user.css
index 1a55b4fc5..878f98317 100644
--- a/modules/user/user.css
+++ b/modules/user/user.css
@@ -34,7 +34,7 @@
   clear: both;
   margin: 1em 0;
 }
-.profile .picture {
+.profile .user-picture {
   float: right; /* LTR */
   margin: 0 1em 1em 0; /* LTR */
 }
diff --git a/modules/user/user.module b/modules/user/user.module
index d36e270a2..584e7ce74 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -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_picture(&$variables) {
     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);
       }
     }
   }