[livejournal] r22110: LJSUP-12150: New Repost feature (S2)

U   trunk/cgi-bin/LJ/Entry/Repost.pm
U   trunk/cgi-bin/LJ/S2/MonthPage.pm

Modified: trunk/cgi-bin/LJ/Entry/Repost.pm
===================================================================
--- trunk/cgi-bin/LJ/Entry/Repost.pm	2012-05-30 10:18:03 UTC (rev 22109)
+++ trunk/cgi-bin/LJ/Entry/Repost.pm	2012-05-30 11:01:12 UTC (rev 22110)
@@ -412,6 +412,7 @@
         my $link = $entry_obj->prop('repost_link'); 
         if ($link) {
             my ($org_journalid, $org_jitemid) = split(/:/, $link);
+            return 0 unless int($org_journalid);
             my $journal = int($org_journalid) ? LJ::want_user($org_journalid) : undef;
             
             my $fake_entry = LJ::Entry->new( $journal, jitemid => $org_jitemid);
@@ -485,8 +486,6 @@
 
     if ($opts->{'subject_repost'}) {
         my $subject_text = $original_entry_obj->subject_html;
-        my $repost_text = LJ::Lang::ml('entry.reference.subject');
-        $subject_text .= " ( $repost_text )";
         ${$opts->{'subject_repost'}} = $subject_text;
     }
 

Modified: trunk/cgi-bin/LJ/S2/MonthPage.pm
===================================================================
--- trunk/cgi-bin/LJ/S2/MonthPage.pm	2012-05-30 10:18:03 UTC (rev 22109)
+++ trunk/cgi-bin/LJ/S2/MonthPage.pm	2012-05-30 11:01:12 UTC (rev 22110)
@@ -200,8 +200,8 @@
             'comments' => $comments,
             'userpic' => $userpic,
             'permalink_url' => $permalink,
-            'original_journalid' => $repost_entry_obj ? $repost_entry_obj->journalid : undef,
-            'original_itemid'    => $repost_entry_obj ? $repost_entry_obj->jitemid : undef,
+            'real_journalid' => $repost_entry_obj ? $repost_entry_obj->journalid : undef,
+            'real_itemid'    => $repost_entry_obj ? $repost_entry_obj->jitemid : undef,
         });
 
         push @{$day_entries{$day}}, $entry;