[livejournal] r21225: LJSV-1655: When reposting an lj-cut entr...

LJSV-1655: When reposting an lj-cut entry, the cut link goes to the original entry, not the repost

U   trunk/cgi-bin/LJ/Entry.pm
U   trunk/cgi-bin/LJ/S2/DayPage.pm
U   trunk/cgi-bin/LJ/S2/RecentPage.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-02-21 09:36:42 UTC (rev 21224)
+++ trunk/cgi-bin/LJ/Entry.pm	2012-02-21 10:27:37 UTC (rev 21225)
@@ -870,10 +870,10 @@
 
     if($opts->{no_cut_expand}) {
         $opts->{expand_cut} = 0;
-        $opts->{cuturl}     = $self->prop('reposted_from') || $self->url . '?page=' . $opts->{page} . '&cut_expand=1';
+        $opts->{cuturl}     = $self->url . '?page=' . $opts->{page} . '&cut_expand=1';
     } elsif (!$opts->{cuturl}) {
         $opts->{expand_cut} = 1;
-        $opts->{cuturl}     = $self->prop('reposted_from') || $self->url;
+        $opts->{cuturl}     = $self->url;
     }
     $opts->{journalid} = $self->journalid;
     $opts->{posterid}  = $self->posterid;

Modified: trunk/cgi-bin/LJ/S2/DayPage.pm
===================================================================
--- trunk/cgi-bin/LJ/S2/DayPage.pm	2012-02-21 09:36:42 UTC (rev 21224)
+++ trunk/cgi-bin/LJ/S2/DayPage.pm	2012-02-21 10:27:37 UTC (rev 21225)
@@ -158,7 +158,7 @@
             \$text,
             {
                 'preformatted'        => $logprops{$itemid}->{'opt_preformatted'},
-                'cuturl'              => $entry_obj->prop('reposted_from') || $entry_obj->url,
+                'cuturl'              => $entry_obj->url,
                 'entry_url'           => $entry_obj->prop('reposted_from') || $entry_obj->url,
                 'ljcut_disable'       => $ljcut_disable,
                 'suspend_msg'         => $suspend_msg,

Modified: trunk/cgi-bin/LJ/S2/RecentPage.pm
===================================================================
--- trunk/cgi-bin/LJ/S2/RecentPage.pm	2012-02-21 09:36:42 UTC (rev 21224)
+++ trunk/cgi-bin/LJ/S2/RecentPage.pm	2012-02-21 10:27:37 UTC (rev 21225)
@@ -178,7 +178,7 @@
             \$text,
             {
                 'preformatted'        => $logprops{$itemid}->{'opt_preformatted'},
-                'cuturl'              => $entry_obj->prop('reposted_from') || $entry_obj->url,
+                'cuturl'              => $entry_obj->url,
                 'entry_url'           => $entry_obj->prop('reposted_from') || $entry_obj->url,
                 'ljcut_disable'       => $ljcut_disable,
                 'suspend_msg'         => $suspend_msg,

Modified: trunk/cgi-bin/ljviews.pl
===================================================================
--- trunk/cgi-bin/ljviews.pl	2012-02-21 09:36:42 UTC (rev 21224)
+++ trunk/cgi-bin/ljviews.pl	2012-02-21 10:27:37 UTC (rev 21225)
@@ -1342,7 +1342,7 @@
             \$event,
             {
                 'preformatted'        => $logprops{$itemid}->{'opt_preformatted'},
-                'cuturl'              => $entry_obj->prop('reposted_from') || $entry_obj->url,
+                'cuturl'              => $entry_obj->url,
                 'entry_url'           => $entry_obj->prop('reposted_from') || $entry_obj->url,
                 'ljcut_disable'       => $ljcut_disable,
                 'suspend_msg'         => $suspend_msg,
@@ -1920,7 +1920,7 @@
         LJ::CleanHTML::clean_event(
             \$event, {
                 'preformatted'        => $logprops{$datakey}->{'opt_preformatted'},
-                'cuturl'              => $entry_obj->prop('reposted_from') || $entry_obj->url(%urlopts_style),
+                'cuturl'              => $entry_obj->url(%urlopts_style),
                 'entry_url'           => $entry_obj->prop('reposted_from') || $entry_obj->url,
                 'ljcut_disable'       => $ljcut_disable,
                 'suspend_msg'         => $suspend_msg,
@@ -2677,7 +2677,7 @@
             \$event,
             {
                 'preformatted'        => $logprops{$itemid}->{'opt_preformatted'},
-                'cuturl'              => $entry_obj->prop('reposted_from') || $entry_obj->url,
+                'cuturl'              => $entry_obj->url,
                 'entry_url'           => $entry_obj->prop('reposted_from') || $entry_obj->url,
                 'ljcut_disable'       => $ljcut_disable,
                 'suspend_msg'         => $suspend_msg,

Modified: trunk/htdocs/talkpost.bml
===================================================================
--- trunk/htdocs/talkpost.bml	2012-02-21 09:36:42 UTC (rev 21224)
+++ trunk/htdocs/talkpost.bml	2012-02-21 10:27:37 UTC (rev 21225)
@@ -245,7 +245,7 @@
     LJ::CleanHTML::clean_event(\$event, { 'preformatted' => $preformatted,
                                           'suspend_msg' => $suspend_msg,
                                           'unsuspend_supportid' => $suspend_msg ? $entry->prop("unsuspend_supportid") : 0, 
-                                          'cuturl' => $entry->prop('reposted_from') || $talkurl,
+                                          'cuturl' => $talkurl,
                                           'entry_url' => $entry->prop('reposted_from') || $talkurl,
                                           'expand_cut' => 1,
                                           'journalid' =>  $entry->journalid,