fu: Close-up of Fu, bringing a scoop of water to her mouth (Default)
fu ([personal profile] fu) wrote in [site community profile] changelog2012-03-05 10:49 am

[dw-free] In some situations, "Irreparable invalid markup" link uses invalid markup

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

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

Tweak item_link to expect a string, rather than an array, because this is
what we pass in always (and we've got some methods that handle the
stringification already)

Patch by [personal profile] fu.

Files modified:
  • cgi-bin/LJ/Entry.pm
--------------------------------------------------------------------------------
diff -r feb1c053a277 -r df2d8d5002f7 cgi-bin/LJ/Entry.pm
--- a/cgi-bin/LJ/Entry.pm	Mon Mar 05 18:48:26 2012 +0800
+++ b/cgi-bin/LJ/Entry.pm	Mon Mar 05 18:50:04 2012 +0800
@@ -2202,13 +2202,11 @@
 # </LJFUNC>
 sub item_link
 {
-    my ($u, $itemid, $anum, @args) = @_;
+    my ($u, $itemid, $anum, $args) = @_;
     my $ditemid = $itemid*256 + $anum;
     $u = LJ::load_user( $u ) unless LJ::isu( $u );
 
-    # XXX: should have an option of returning a url with escaped (&amp;)
-    #      or non-escaped (&) arguments.  a new link object would be best.
-    my $args = @args ? "?" . join("&amp;", @args) : "";
+    $args = $args ? "?$args" : "";
     return $u->journal_base . "/$ditemid.html$args";
 }
 
--------------------------------------------------------------------------------