Merge branch 'uiredesign' of ../evan into uiredesign

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__);