wisest owl (wisest_owl) wrote in changelog,
wisest owl
wisest_owl
changelog

[ljcom] r12240: LJSUP-12853: Public suspend reason isn't...

Committer: wisest-owl
LJSUP-12853: Public suspend reason isn't visible for entries

U   trunk/cgi-bin/LJ/Widget/ErrorPage.pm
U   trunk/htdocs/error-page.bml.text
Modified: trunk/cgi-bin/LJ/Widget/ErrorPage.pm
===================================================================
--- trunk/cgi-bin/LJ/Widget/ErrorPage.pm	2012-07-09 08:05:13 UTC (rev 12239)
+++ trunk/cgi-bin/LJ/Widget/ErrorPage.pm	2012-07-09 09:28:11 UTC (rev 12240)
@@ -152,7 +152,9 @@
     'suspended_post' => sub {
         my %args             = @_;
         my $journal_username = $args{'journal_username'};
-        my $suspend_reason   = $args{'journal'}->prop ('suspend_reason');
+        my $entry_url        = "http://".$journal_username.".".$LJ::DOMAIN.$args{'uri'};
+        my $entry            = LJ::Entry->new_from_url ($entry_url);
+        my $suspend_reason   = $entry ? $entry->prop ('suspend_reason') : "";
 
         my $description_ml_var = '.errorpage.suspended_post.description.alien';
         if ($suspend_reason) {
@@ -433,6 +435,7 @@
         'remote'                => $remote,
         'journal_username'      => $active_journal_username,
         'remote_equals_journal' => LJ::u_equals( $remote, $journal ),
+        'uri'                   => $uri,
     );
 
     LJ::Lang::current_scope('/error-page.bml');

Modified: trunk/htdocs/error-page.bml.text
===================================================================
--- trunk/htdocs/error-page.bml.text	2012-07-09 08:05:13 UTC (rev 12239)
+++ trunk/htdocs/error-page.bml.text	2012-07-09 09:28:11 UTC (rev 12240)
@@ -124,7 +124,7 @@
 .errorpage.suspended.description.alien|staleness=1
 .errorpage.suspended.description.alien=This journal has been suspended, all posts of this journal are not available for reading. For confidentiality reasons we can not discuss the reasons for which the account was frozen, with someone else other than the account holder.
 
-.errorpage.suspended.description.alien.suspend=This journal has been suspended, all posts of this journal are not available for reading. For confidentiality reasons we can not discuss the reasons for which the account was frozen, with someone else other than the account holder. The reason for this suspension is [[suspend_reason]].
+.errorpage.suspended.description.alien.reason=This journal has been suspended, all posts of this journal are not available for reading. For confidentiality reasons we can not discuss the reasons for which the account was frozen, with someone else other than the account holder. The reason for this suspension is [[suspend_reason]].
 
 .errorpage.suspended.description.owner|staleness=1
 .errorpage.suspended.description.owner=Your journal has been suspended, all posts of this journal are not available for reading.
@@ -137,7 +137,7 @@
 .errorpage.suspended_post.description.alien|staleness=1
 .errorpage.suspended_post.description.alien=This entry has been suspended and not available for reading. For confidentiality reasons we can not discuss the reasons for which the entry was frozen, with someone else other than the account holder.
 
-.errorpage.suspended.description.alien.reason=This entry has been suspended and not available for reading. For confidentiality reasons we can not discuss the reasons for which the entry was frozen, with someone else other than the account holder. The reason for this suspension is [[suspend_reason]].
+.errorpage.suspended_post.description.alien.reason=This entry has been suspended and not available for reading. For confidentiality reasons we can not discuss the reasons for which the entry was frozen, with someone else other than the account holder. The reason for this suspension is [[suspend_reason]].
 
 .errorpage.suspended_photo_album.description=You cannot view this photo/album because it has been suspended.
 

Tags: ljcom, pm, text, wisest-owl
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