summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-02-09 07:15:52 -0500
committerEvan Prodromou <evan@controlyourself.ca>2009-02-09 07:15:52 -0500
commitaa06d760b375c0cc9bbc693bf4bd412e9fda8f50 (patch)
tree8a7f82e7bd30adb2dd120eba9f4364e983d27520 /lib
parent9152c0bdc8e23ca0ff03c72c5891d3db9c5e9d4f (diff)
Index and Action use Exceptions
Main Web entry point accepts exceptions, and main code in Action throws them.
Diffstat (limited to 'lib')
-rw-r--r--lib/action.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/action.php b/lib/action.php
index c4172ada1..9fbabb4fc 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -789,11 +789,12 @@ class Action extends HTMLOutputter // lawsuit
*
* @return nothing
*/
+
function serverError($msg, $code=500)
{
$action = $this->trimmed('action');
common_debug("Server error '$code' on '$action': $msg", __FILE__);
- common_server_error($msg, $code);
+ throw new ServerException($msg, $code);
}
/**
@@ -804,11 +805,12 @@ class Action extends HTMLOutputter // lawsuit
*
* @return nothing
*/
+
function clientError($msg, $code=400)
{
$action = $this->trimmed('action');
common_debug("User error '$code' on '$action': $msg", __FILE__);
- common_user_error($msg, $code);
+ throw new ClientException($msg, $code);
}
/**