[livejournal] r17940: LJSUP-7377: Wishlist - LJSUP-7620: Displ...

U   trunk/cgi-bin/cleanhtml.pl

Modified: trunk/cgi-bin/cleanhtml.pl
===================================================================
--- trunk/cgi-bin/cleanhtml.pl	2010-12-15 11:00:18 UTC (rev 17939)
+++ trunk/cgi-bin/cleanhtml.pl	2010-12-15 11:50:53 UTC (rev 17940)
@@ -416,11 +416,7 @@
             if ($tag eq "lj-wishlist") {
                 my $wishid = $attr->{wishid};
                 my $userid = $attr->{userid};
-                my $u = LJ::load_userid($userid);
-                next TOKEN unless $u;
-                my $wish = LJ::WishElement->load($u, $wishid);
-                next TOKEN unless $wish;
-                $newdata .= Encode::decode_utf8($wish->expand_entry);
+                $newdata .= Encode::decode_utf8(LJ::WishElement->check_and_expand_entry($userid, $wishid));
             }
 
             # Capture object and embed tags to possibly transform them into something else.