[livejournal] r23167: LJSUP-13801: Wrong url when using old re...

LJSUP-13801: Wrong url when using old repost button

U   trunk/cgi-bin/LJ/Entry.pm
U   trunk/cgi-bin/ljviews.pl
U   trunk/htdocs/talkpost.bml

Modified: trunk/cgi-bin/LJ/Entry.pm
===================================================================
--- trunk/cgi-bin/LJ/Entry.pm	2012-10-18 07:04:56 UTC (rev 23166)
+++ trunk/cgi-bin/LJ/Entry.pm	2012-10-18 08:44:51 UTC (rev 23167)
@@ -934,7 +934,7 @@
     }
     $opts->{journalid} = $self->journalid;
     $opts->{posterid}  = $self->posterid;
-    $opts->{entry_url} = $self->prop('reposted_from') || $self->url;
+    $opts->{entry_url} = $self->url;
 
     $self->_load_text unless $self->{_loaded_text};
     my $event = $self->{event};

Modified: trunk/cgi-bin/ljviews.pl
===================================================================
--- trunk/cgi-bin/ljviews.pl	2012-10-18 07:04:56 UTC (rev 23166)
+++ trunk/cgi-bin/ljviews.pl	2012-10-18 08:44:51 UTC (rev 23167)
@@ -1370,7 +1370,7 @@
             {
                 'preformatted'        => $logprops{$itemid}->{'opt_preformatted'},
                 'cuturl'              => $entry_obj->url,
-                'entry_url'           => $entry_obj->prop('reposted_from') || $entry_obj->url,
+                'entry_url'           => $entry_obj->url,
                 'ljcut_disable'       => $ljcut_disable,
                 'suspend_msg'         => $suspend_msg,
                 'unsuspend_supportid' => $suspend_msg ? $entry_obj->prop("unsuspend_supportid") : 0,
@@ -2008,7 +2008,7 @@
             \$event, {
                 'preformatted'        => $logprops{$datakey}->{'opt_preformatted'},
                 'cuturl'              => $entry_obj->url(%urlopts_style),
-                'entry_url'           => $entry_obj->prop('reposted_from') || $entry_obj->url,
+                'entry_url'           => $entry_obj->url,
                 'ljcut_disable'       => $ljcut_disable,
                 'suspend_msg'         => $suspend_msg,
                 'unsuspend_supportid' => $suspend_msg ? $entry_obj->prop("unsuspend_supportid") : 0,
@@ -2799,7 +2799,7 @@
             {
                 'preformatted'        => $logprops{$itemid}->{'opt_preformatted'},
                 'cuturl'              => $entry_obj->url,
-                'entry_url'           => $entry_obj->prop('reposted_from') || $entry_obj->url,
+                'entry_url'           => $entry_obj->url,
                 'ljcut_disable'       => $ljcut_disable,
                 'suspend_msg'         => $suspend_msg,
                 'unsuspend_supportid' => $suspend_msg ? $entry_obj->prop("unsuspend_supportid") : 0,

Modified: trunk/htdocs/talkpost.bml
===================================================================
--- trunk/htdocs/talkpost.bml	2012-10-18 07:04:56 UTC (rev 23166)
+++ trunk/htdocs/talkpost.bml	2012-10-18 08:44:51 UTC (rev 23167)
@@ -246,7 +246,7 @@
                                           'suspend_msg' => $suspend_msg,
                                           'unsuspend_supportid' => $suspend_msg ? $entry->prop("unsuspend_supportid") : 0, 
                                           'cuturl' => $talkurl,
-                                          'entry_url' => $entry->prop('reposted_from') || $talkurl,
+                                          'entry_url' => $talkurl,
                                           'expand_cut' => 1,
                                           'journalid' =>  $entry->journalid,
                                           'posterid' => $entry->posterid,