From 3d169b3bb6491e8ebc69194c717ed61ad894c5d8 Mon Sep 17 00:00:00 2001 From: David Rothstein Date: Mon, 7 Jan 2013 22:18:56 -0500 Subject: [PATCH] Issue #1857956 by catch, David_Rothstein: Do not re-prepare comment update timestamp if it's the same as the created timestamp (performance improvement). --- modules/comment/comment.module | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/comment/comment.module b/modules/comment/comment.module index 8b51f7662c87..46115be042da 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -2288,8 +2288,16 @@ function template_preprocess_comment(&$variables) { $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); + + // 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['new'] = !empty($comment->new) ? t('new') : ''; $variables['picture'] = theme_get_setting('toggle_comment_user_picture') ? theme('user_picture', array('account' => $comment)) : '';