summaryrefslogtreecommitdiff
path: root/modules/comment
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-04-06 19:49:03 +0000
committerDries Buytaert <dries@buytaert.net>2010-04-06 19:49:03 +0000
commitba96cffdb7d3f76254ff7391523a6fc34abf10e2 (patch)
treedd42dc052efda70657a1e73ab1e47964c920d734 /modules/comment
parentc2b1029595afe103b5f1533604cfe658755f1f8d (diff)
downloadbrdo-ba96cffdb7d3f76254ff7391523a6fc34abf10e2.tar.gz
brdo-ba96cffdb7d3f76254ff7391523a6fc34abf10e2.tar.bz2
- Patch #699440 by scor, effulgentsia, noahb, catch: add bundle support to entity_uri() callback to remove performance overhead of forum_url_outbound_alter().
Diffstat (limited to 'modules/comment')
-rw-r--r--modules/comment/comment.module6
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 42f9a0ff2..83834b613 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -2161,8 +2161,10 @@ function template_preprocess_comment(&$variables) {
$variables['new'] = !empty($comment->new) ? t('new') : '';
$variables['picture'] = theme_get_setting('toggle_comment_user_picture') ? theme('user_picture', array('account' => $comment)) : '';
$variables['signature'] = $comment->signature;
- $variables['title'] = l($comment->subject, 'comment/' . $comment->cid, array('fragment' => "comment-$comment->cid"));
- $variables['permalink'] = l('#', 'comment/' . $comment->cid, array('fragment' => "comment-$comment->cid"));
+
+ $uri = entity_uri('comment', $comment);
+ $variables['title'] = l($comment->subject, $uri['path'], $uri['options']);
+ $variables['permalink'] = l('#', $uri['path'], $uri['options']);
// Preprocess fields.
field_attach_preprocess('comment', $comment, $variables['elements'], $variables);