Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #1857956 by catch, David_Rothstein: Do not re-prepare comment update timestamp if it's the same as the created timestamp (performance improvement).

merge-requests/26/head
David Rothstein 2013-01-07 22:18:56 -05:00
parent 286deb81ec
commit 3d169b3bb6
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/comment/comment.module
View File

@ -2288,8 +2288,16 @@ function template_preprocess_comment(&$variables) {
$variables['comment'] = $comment; $variables['comment'] = $comment;
$variables['node'] = $node; $variables['node'] = $node;
$variables['author'] = theme('username', array('account' => $comment)); $variables['author'] = theme('username', array('account' => $comment));
$variables['created'] = format_date($comment->created); $variables['created'] = format_date($comment->created);
// Avoid calling format_date() twice on the same timestamp.
if ($comment->changed == $comment->created) {
$variables['changed'] = $variables['created'];
}
else {
$variables['changed'] = format_date($comment->changed); $variables['changed'] = format_date($comment->changed);
}
$variables['new'] = !empty($comment->new) ? t('new') : ''; $variables['new'] = !empty($comment->new) ? t('new') : '';
$variables['picture'] = theme_get_setting('toggle_comment_user_picture') ? theme('user_picture', array('account' => $comment)) : ''; $variables['picture'] = theme_get_setting('toggle_comment_user_picture') ? theme('user_picture', array('account' => $comment)) : '';