[livejournal] r17165: LJSUP-6532. Error Pages Improvements

U   trunk/cgi-bin/Apache/LiveJournal.pm
U   trunk/cgi-bin/LJ/S2/EntryPage.pm
U   trunk/cgi-bin/LJ/User.pm

Modified: trunk/cgi-bin/Apache/LiveJournal.pm
===================================================================
--- trunk/cgi-bin/Apache/LiveJournal.pm	2010-08-20 03:25:32 UTC (rev 17164)
+++ trunk/cgi-bin/Apache/LiveJournal.pm	2010-08-20 06:44:52 UTC (rev 17165)
@@ -1631,7 +1631,7 @@
         $generate_iejunk = 1;
 
     } elsif ($opts->{'suspendedentry'}) {
-        LJ::Request->pnotes ('error' => 'suspended');
+        LJ::Request->pnotes ('error' => 'suspended_post');
         $status = "403 Entry suspended";
         $html = "<h1>Suspended Entry</h1>" .
                 "<p>The entry at this URL is suspended.  You cannot reply to it.</p>";

Modified: trunk/cgi-bin/LJ/S2/EntryPage.pm
===================================================================
--- trunk/cgi-bin/LJ/S2/EntryPage.pm	2010-08-20 03:25:32 UTC (rev 17164)
+++ trunk/cgi-bin/LJ/S2/EntryPage.pm	2010-08-20 06:44:52 UTC (rev 17165)
@@ -433,7 +433,7 @@
 
     if ($entry && $entry->is_suspended_for($remote)) {
         $opts->{'suspendedentry'} = 1;
-        LJ::Request->pnotes ('error' => 'suspended');
+        LJ::Request->pnotes ('error' => 'suspended_post');
         LJ::Request->pnotes ('remote' => LJ::get_remote());
         return;
     }

Modified: trunk/cgi-bin/LJ/User.pm
===================================================================
--- trunk/cgi-bin/LJ/User.pm	2010-08-20 03:25:32 UTC (rev 17164)
+++ trunk/cgi-bin/LJ/User.pm	2010-08-20 06:44:52 UTC (rev 17165)
@@ -9032,15 +9032,14 @@
         #return $error->("This journal has been suspended.", "403 Forbidden") if ($u->is_suspended);
 
         my $entry = $opts->{ljentry};
-=head
-for LJSUP-6347
+
         if ($entry && $entry->is_suspended_for($remote)) {
             LJ::Request->pnotes ('error' => 'suspended_post');
             LJ::Request->pnotes ('remote' => LJ::get_remote ());
             $opts->{'handler_return'} = "403 Forbidden";
             return;
         }
-=cut
+
         return $error->("This entry has been suspended. You can visit the journal <a href='" . $u->journal_base . "/'>here</a>.", "403 Forbidden")
             if $entry && $entry->is_suspended_for($remote);
     }