Fix option to ignore cuts on the reading page.

        Patch by yvi. 

diffs (50 lines):

diff -r b7dc7ed7dd32 -r 43bbf85049d0 cgi-bin/LJ/S2.pm
--- a/cgi-bin/LJ/S2.pm  Sun Oct 18 05:44:14 2009 +0000
+++ b/cgi-bin/LJ/S2.pm  Sun Oct 18 13:33:35 2009 +0000
@@ -1862,8 +1862,9 @@ sub Entry_from_entryobj
 
     my $suspend_msg = $entry_obj && $entry_obj->should_show_suspend_msg_to( 
$remote ) ? 1 : 0;
     # cleaning the entry text: cuts and such
+    my $cut_disable = $opts->{cut_disable};
     my $cleanhtml_opts = { cuturl => LJ::item_link( $journal, $jitemid, $anum 
),
-        ljcut_disable => $remote ? $remote->prop( 'opt_cut_disable_journal' ) 
: undef,
+        ljcut_disable => $cut_disable,
         suspend_msg => $suspend_msg,
         unsuspend_supportid => $suspend_msg ? $entry_obj->prop( 
'unsuspend_supportid' ) : 0
     };
diff -r b7dc7ed7dd32 -r 43bbf85049d0 cgi-bin/LJ/S2/DayPage.pm
--- a/cgi-bin/LJ/S2/DayPage.pm  Sun Oct 18 05:44:14 2009 +0000
+++ b/cgi-bin/LJ/S2/DayPage.pm  Sun Oct 18 13:33:35 2009 +0000
@@ -86,6 +86,8 @@ sub DayPage
         $apu{$_->{posterid}} = undef;
     }
 
+    $opts->{cut_disable} = ( $remote && $remote->prop( 
'opt_cut_disable_journal' ) );
+
   ENTRY:
     foreach my $item (@items)
     {
diff -r b7dc7ed7dd32 -r 43bbf85049d0 cgi-bin/LJ/S2/FriendsPage.pm
--- a/cgi-bin/LJ/S2/FriendsPage.pm      Sun Oct 18 05:44:14 2009 +0000
+++ b/cgi-bin/LJ/S2/FriendsPage.pm      Sun Oct 18 13:33:35 2009 +0000
@@ -150,6 +150,8 @@ sub FriendsPage
 
     my $eventnum = 0;
     my $hiddenentries = 0;
+    $opts->{cut_disable} = ( $remote && $remote->prop( 
'opt_cut_disable_reading' ) );
+
   ENTRY:
     foreach my $item (@items)
     {
diff -r b7dc7ed7dd32 -r 43bbf85049d0 cgi-bin/LJ/S2/RecentPage.pm
--- a/cgi-bin/LJ/S2/RecentPage.pm       Sun Oct 18 05:44:14 2009 +0000
+++ b/cgi-bin/LJ/S2/RecentPage.pm       Sun Oct 18 13:33:35 2009 +0000
@@ -127,6 +127,8 @@ sub RecentPage
         $apu{$_->{posterid}} = undef;
     }
 
+    $opts->{cut_disable} = ( $remote && $remote->prop( 
'opt_cut_disable_journal' ) );
+
   ENTRY:
     foreach my $item (@items)
     {
_______________________________________________
dw-changelog mailing list
[email protected]
http://lists.dwscoalition.org/mailman/listinfo/dw-changelog

Reply via email to