madeon (madeon) wrote in changelog,
madeon
madeon
changelog

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

Committer: sbelyaev
LJSV-1655: When reposting an lj-cut entry, the cut link goes to the original entry, not the repost
U   trunk/cgi-bin/LJ/S2/DayPage.pm
U   trunk/cgi-bin/LJ/S2/FriendsPage.pm
U   trunk/cgi-bin/LJ/S2/RecentPage.pm
U   trunk/cgi-bin/LJ/S2.pm
Modified: trunk/cgi-bin/LJ/S2/DayPage.pm
===================================================================
--- trunk/cgi-bin/LJ/S2/DayPage.pm	2012-03-13 14:08:44 UTC (rev 21400)
+++ trunk/cgi-bin/LJ/S2/DayPage.pm	2012-03-13 14:34:46 UTC (rev 21401)
@@ -159,7 +159,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/cgi-bin/LJ/S2/FriendsPage.pm
===================================================================
--- trunk/cgi-bin/LJ/S2/FriendsPage.pm	2012-03-13 14:08:44 UTC (rev 21400)
+++ trunk/cgi-bin/LJ/S2/FriendsPage.pm	2012-03-13 14:34:46 UTC (rev 21401)
@@ -293,8 +293,8 @@
             \$text,
             {
                  'preformatted'        => $logprops{$datakey}->{'opt_preformatted'},
-                 'cuturl'              => $entry_obj->prop('reposted_from') || $entry_obj->url(%urlopts_style),
-                 'entry_url'           => $entry_obj->prop('reposted_from') || $entry_obj->url,
+                 'cuturl'              => $entry_obj->url(%urlopts_style),
+                 '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/cgi-bin/LJ/S2/RecentPage.pm
===================================================================
--- trunk/cgi-bin/LJ/S2/RecentPage.pm	2012-03-13 14:08:44 UTC (rev 21400)
+++ trunk/cgi-bin/LJ/S2/RecentPage.pm	2012-03-13 14:34:46 UTC (rev 21401)
@@ -179,7 +179,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/cgi-bin/LJ/S2.pm
===================================================================
--- trunk/cgi-bin/LJ/S2.pm	2012-03-13 14:08:44 UTC (rev 21400)
+++ trunk/cgi-bin/LJ/S2.pm	2012-03-13 14:34:46 UTC (rev 21401)
@@ -4860,8 +4860,8 @@
     my $text = $entry->event_raw;
     LJ::CleanHTML::clean_event( \$text, {
         'preformatted'          => $entry->prop('opt_preformatted'),
-        'cuturl'                => $entry->prop('reposted_from') || $entry->url,
-        'entry_url'             => $entry->prop('reposted_from') || $entry->url,
+        'cuturl'                => $entry->url,
+        'entry_url'             => $entry->url,
         'ljcut_disable'         => 0,
         'journalid'             => $entry->journalid,
         'posterid'              => $entry->posterid,

Tags: livejournal, madeon, pm, sbelyaev
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments