diff options
author | Evan Prodromou <evan@status.net> | 2009-09-29 18:03:10 -0400 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2009-09-29 18:03:10 -0400 |
commit | fe7848e8b87b6a3f44fc8b7a58f79812d197dec2 (patch) | |
tree | 7fda5c89a9cf78f2740f5b973e832e07b06f4992 /lib/servererroraction.php | |
parent | 4298f28eaed04a1247a1e474844e91fbbc992013 (diff) | |
parent | 5309910b9b4dd2533ff5b2190f90bf415fd20113 (diff) |
Merge branch '0.8.x' into 0.9.x
Conflicts:
actions/twitapistatuses.php
Diffstat (limited to 'lib/servererroraction.php')
-rw-r--r-- | lib/servererroraction.php | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/lib/servererroraction.php b/lib/servererroraction.php index c6400605e..0993a63bc 100644 --- a/lib/servererroraction.php +++ b/lib/servererroraction.php @@ -55,17 +55,17 @@ require_once INSTALLDIR.'/lib/error.php'; class ServerErrorAction extends ErrorAction { + static $status = array(500 => 'Internal Server Error', + 501 => 'Not Implemented', + 502 => 'Bad Gateway', + 503 => 'Service Unavailable', + 504 => 'Gateway Timeout', + 505 => 'HTTP Version Not Supported'); + function __construct($message='Error', $code=500) { parent::__construct($message, $code); - $this->status = array(500 => 'Internal Server Error', - 501 => 'Not Implemented', - 502 => 'Bad Gateway', - 503 => 'Service Unavailable', - 504 => 'Gateway Timeout', - 505 => 'HTTP Version Not Supported'); - $this->default = 500; // Server errors must be logged. @@ -93,9 +93,4 @@ class ServerErrorAction extends ErrorAction $this->showPage(); } - - function title() - { - return $this->status[$this->code]; - } } |