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/error.php | |
parent | 4298f28eaed04a1247a1e474844e91fbbc992013 (diff) | |
parent | 5309910b9b4dd2533ff5b2190f90bf415fd20113 (diff) |
Merge branch '0.8.x' into 0.9.x
Conflicts:
actions/twitapistatuses.php
Diffstat (limited to 'lib/error.php')
-rw-r--r-- | lib/error.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/error.php b/lib/error.php index 0c521db08..6a9b76be1 100644 --- a/lib/error.php +++ b/lib/error.php @@ -44,9 +44,10 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { */ class ErrorAction extends Action { + static $status = array(); + var $code = null; var $message = null; - var $status = null; var $default = null; function __construct($message, $code, $output='php://output', $indent=true) @@ -88,9 +89,10 @@ class ErrorAction extends Action * * @return page title */ + function title() { - return $this->message; + return self::$status[$this->code]; } function isReadOnly($args) |