diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module index cf499236ffd5af167675e1a138e923ab386274ce..6cdc5cce2fd9e74c96c3f1f126bb778e5bbb9f5a 100644 --- a/core/modules/comment/comment.module +++ b/core/modules/comment/comment.module @@ -2263,20 +2263,20 @@ function comment_form_submit($form, &$form_state) { function template_preprocess_comment(&$variables) { $comment = $variables['elements']['#comment']; $node = $variables['elements']['#node']; - $variables['comment'] = $comment; - $variables['node'] = $node; - $variables['author'] = theme('username', array('account' => $comment)); - $variables['created'] = format_date($comment->created); - $variables['changed'] = format_date($comment->changed); - - $variables['new'] = !empty($comment->new) ? t('new') : ''; - $variables['picture'] = theme_get_setting('toggle_comment_user_picture') ? theme('user_picture', array('account' => $comment)) : ''; + $variables['comment'] = $comment; + $variables['node'] = $node; + $variables['author'] = theme('username', array('account' => $comment)); + $variables['created'] = format_date($comment->created); + $variables['changed'] = format_date($comment->changed); + + $variables['new'] = !empty($comment->new) ? t('new') : ''; + $variables['user_picture'] = theme_get_setting('toggle_comment_user_picture') ? theme('user_picture', array('account' => $comment)) : ''; $variables['signature'] = $comment->signature; $uri = entity_uri('comment', $comment); $uri['options'] += array('attributes' => array('class' => 'permalink', 'rel' => 'bookmark')); - $variables['title'] = l($comment->subject, $uri['path'], $uri['options']); + $variables['title'] = l($comment->subject, $uri['path'], $uri['options']); $variables['permalink'] = l(t('Permalink'), $uri['path'], $uri['options']); $variables['submitted'] = t('Submitted by !username on !datetime', array('!username' => $variables['author'], '!datetime' => $variables['created'])); diff --git a/core/modules/comment/comment.tpl.php b/core/modules/comment/comment.tpl.php index a483813d236101fa59fdc55f4356379717eefda4..8ba46d8464d810119a10885056d7fc488dc77d9c 100644 --- a/core/modules/comment/comment.tpl.php +++ b/core/modules/comment/comment.tpl.php @@ -20,7 +20,7 @@ * - $permalink: Comment permalink. * - $submitted: Submission information created from $author and $created during * template_preprocess_comment(). - * - $picture: Authors picture. + * - $user_picture: The comment author's picture from user-picture.tpl.php. * - $signature: Authors signature. * - $status: Comment status. Possible values are: * comment-unpublished, comment-published or comment-preview. @@ -57,34 +57,33 @@ * @see theme_comment() */ ?> -