summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorsarven <csarven@plantard.controlezvous.ca>2009-01-15 23:05:57 +0000
committersarven <csarven@plantard.controlezvous.ca>2009-01-15 23:05:57 +0000
commit0357ea505dd8aba293a67f0bfa122c3bbd29e51b (patch)
tree2329651d23e2795cef00ea80bd1b252c7510fc94 /lib
parent8d9fb7711f32f7b7c0676641dd0c2b9343a5666f (diff)
parent4b0cf99e56f965e10eeb8b8b19e7b405bda49eaf (diff)
Merge branch 'uiredesign' of ../evan into uiredesign
Diffstat (limited to 'lib')
-rw-r--r--lib/action.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/action.php b/lib/action.php
index bd37a8442..33b138905 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -528,14 +528,14 @@ class Action extends HTMLOutputter // lawsuit
}
}
- function server_error($msg, $code=500)
+ function serverError($msg, $code=500)
{
$action = $this->trimmed('action');
common_debug("Server error '$code' on '$action': $msg", __FILE__);
common_server_error($msg, $code);
}
- function client_error($msg, $code=400)
+ function clientError($msg, $code=400)
{
$action = $this->trimmed('action');
common_debug("User error '$code' on '$action': $msg", __FILE__);