Index: /branches/release-39/php/lib/function.mtcommentlink.php
===================================================================
--- /branches/release-39/php/lib/function.mtcommentlink.php (revision 2366)
+++ /branches/release-39/php/lib/function.mtcommentlink.php (revision 2450)
@@ -12,9 +12,12 @@
     $need_clear = false;
     if (empty($e)) {
-        $e = $ctx->mt->db->fetch_entry($c['comment_entry_id']);
+        $entries = $ctx->mt->db->fetch_entries(
+            array('entry_id' => $c['comment_entry_id'], 'class' => '*'));
+        $e = $entries[0];
         $ctx->stash('entry', $e);
         $need_clear = true;
     }
-    $entry_link = $ctx->tag('EntryPermalink', $args);
+    if (empty($e)) return '';
+    $entry_link = $ctx->tag($e['entry_class'].'Permalink', $args);
     $entry_link .= '#comment-' . $c['comment_id'];
 
Index: /branches/release-39/php/lib/mtdb_base.php
===================================================================
--- /branches/release-39/php/lib/mtdb_base.php (revision 2326)
+++ /branches/release-39/php/lib/mtdb_base.php (revision 2450)
@@ -749,4 +749,5 @@
         }
         $class_filter = "and entry_class='$class'";
+        if ($args['class'] == '*') $class_filter = '';
         
         $join_score = "";
Index: /branches/release-39/default_templates/recent_comments.mtml
===================================================================
--- /branches/release-39/default_templates/recent_comments.mtml (revision 2394)
+++ /branches/release-39/default_templates/recent_comments.mtml (revision 2450)
@@ -7,5 +7,5 @@
         <ul class="recent-comments-list">
         </mt:CommentsHeader>
-            <li><__trans phrase="<a href="[_1]">[_2] commented on [_3]</a>: [_4]" params="<mt:CommentEntry><$mt:EntryPermalink$></mt:CommentEntry>#comment-<$mt:CommentID$>%%<$mt:CommentAuthor$>%%<mt:CommentEntry><$mt:EntryTitle$></mt:CommentEntry>%%<$mt:CommentBody remove_html="1" trim_to="10"$>"></li>
+            <li><__trans phrase="<a href="[_1]">[_2] commented on [_3]</a>: [_4]" params="<$mt:CommentLink$>%%<$mt:CommentAuthor$>%%<mt:CommentEntry><$mt:EntryTitle$></mt:CommentEntry>%%<$mt:CommentBody remove_html="1" trim_to="10"$>"></li>
         <mt:CommentsFooter>
         </ul>