mark: A photo of Mark kneeling on top of the Taal Volcano in the Philippines. It was a long hike. (Default)
Mark Smith ([staff profile] mark) wrote in [site community profile] changelog2010-05-04 06:53 am

[dw-free] Comment action links on S2 reply pages don't pass style=mine

[commit: http://hg.dwscoalition.org/dw-free/rev/883eaaea079f]

http://bugs.dwscoalition.org/show_bug.cgi?id=2563

style=mine is not food. (Fix it so it doesn't get eaten.)

Patch by [personal profile] yvi.

Files modified:
  • cgi-bin/LJ/S2/ReplyPage.pm
--------------------------------------------------------------------------------
diff -r 726d8a510868 -r 883eaaea079f cgi-bin/LJ/S2/ReplyPage.pm
--- a/cgi-bin/LJ/S2/ReplyPage.pm	Mon May 03 06:51:52 2010 +0000
+++ b/cgi-bin/LJ/S2/ReplyPage.pm	Tue May 04 06:53:30 2010 +0000
@@ -190,6 +190,7 @@ sub ReplyPage
 
         my $dtalkid = $re_talkid * 256 + $entry->anum;
         my $cmtobj = LJ::Comment->new( $u, dtalkid => $dtalkid );
+        my $replyargs = LJ::viewing_style_args( %$get );
         $replyto = {
             '_type' => 'Comment',
             'subject' => LJ::ehtml($parpost->{'subject'}),
@@ -198,10 +199,10 @@ sub ReplyPage
             'poster' => $s2poster,
             'journal' => $s2entry->{'journal'},
             'metadata' => {},
-            'permalink_url' => $u->{'_journalbase'} . "/$ditemid.html?view=$dtalkid" . LJ::Talk::comment_anchor( $dtalkid ),
+            'permalink_url' => $cmtobj->url( $replyargs ),
             'depth' => 1,
-            'parent_url' => $cmtobj->parent_url,
-            'threadroot_url' => $cmtobj->threadroot_url,
+            'parent_url' => $cmtobj->parent_url( $replyargs ),
+            'threadroot_url' => $cmtobj->threadroot_url( $replyargs ),
             'time' => $datetime,
             'system_time' => $datetime,
             'tags' => [],
--------------------------------------------------------------------------------