Андрей (andy) wrote in changelog,
Андрей
andy
changelog

[ljcom] r11993: LJSUP-12289 (new photo hosting: disable ...

Committer: ailyin
LJSUP-12289 (new photo hosting: disable serving image data from apache)
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-05-23 08:13:53 UTC (rev 11992)
+++ trunk/cgi-bin/LJ/Widget/ErrorPage.pm	2012-05-23 08:34:50 UTC (rev 11993)
@@ -40,6 +40,13 @@
         );
     },
 
+    'knownissues' => sub {
+        return LJ::Lang::ml(
+            '.errorpage.link.knownissues',
+            { 'aopts' => "href='$LJ::SITEROOT/support/'" },
+        );
+    },
+
     'sitemap' => sub {
         return LJ::Lang::ml(
             '.errorpage.not_found.link.site_map',
@@ -99,6 +106,15 @@
         };
     },
 
+    'e500' => sub {
+        return {
+            'title'       => LJ::Lang::ml('.errorpage.internal.title'),
+            'description' => LJ::Lang::ml('.errorpage.internal.description'),
+            'links'       => [qw( status knownissues home faq sitemap )],
+            'ads_location' => 'error_page.internal',
+        };
+    },
+
     'baduser' => sub {
         my %args             = @_;
         my $journal_username = $args{'journal_username'};

Modified: trunk/htdocs/error-page.bml.text
===================================================================
--- trunk/htdocs/error-page.bml.text	2012-05-23 08:13:53 UTC (rev 11992)
+++ trunk/htdocs/error-page.bml.text	2012-05-23 08:34:50 UTC (rev 11993)
@@ -51,9 +51,15 @@
 .errorpage.expunged.title|staleness=1
 .errorpage.expunged.title=Purged Account
 
+.errorpage.internal.title=Internal Server Error
+
+.errorpage.internal.description=The server encountered an internal error or misconfiguration and was unable to complete your request.
+
 .errorpage.link.go_home|staleness=1
 .errorpage.link.go_home=<a [[aopts]]>Go home</a>
 
+.errorpage.link.knownissues=View current <a [[aopts]]>known issues</a> on LiveJournal.
+
 .errorpage.links|staleness=1
 .errorpage.links=Use links for more options:
 

Tags: ailyin, andy, ljcom, pm, text
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