[livejournal] r23312: LJSUP-14273: Incorrect links in friends_...

LJSUP-14273: Incorrect links in friends_rss

U   trunk/cgi-bin/ljfeed.pl

Modified: trunk/cgi-bin/ljfeed.pl
===================================================================
--- trunk/cgi-bin/ljfeed.pl	2012-11-15 11:52:36 UTC (rev 23311)
+++ trunk/cgi-bin/ljfeed.pl	2012-11-15 11:59:32 UTC (rev 23312)
@@ -395,13 +395,14 @@
         my $entry = shift @$objs;
         my $itemid = $it->{itemid};
         my $ditemid = $it->{ditemid};
-
+        my $url  = $entry->url;
+        
         $ret .= "<item>\n";
-        $ret .= "  <guid isPermaLink='true'>$journalinfo->{link}$ditemid.html</guid>\n";
+        $ret .= "  <guid isPermaLink='true'>$url</guid>\n";
         $ret .= "  <pubDate>" . LJ::TimeUtil->time_to_http($it->{createtime}) . "</pubDate>\n";
         $ret .= "  <title>" . LJ::exml($it->{subject}) . "</title>\n" if $it->{subject};
         $ret .= "  <author>" . LJ::exml($journalinfo->{email}) . "</author>" if $journalinfo->{email};
-        $ret .= "  <link>" . $entry->url . "</link>\n";
+        $ret .= "  <link>$url</link>\n";
         # omit the description tag if we're only syndicating titles
         #   note: the $event was also emptied earlier, in make_feed
         unless ($u->{'opt_synlevel'} eq 'title') {