Merge branch 'master' into testing

Conflicts:
	lib/rssaction.php
	lib/twitterapi.php

2 files changed, 7 insertions, 2 deletions

diff --git a/index.php b/index.php
index 5f13064da..2e74d38fb 100644
--- a/index.php
+++ b/index.php
@@ -73,7 +73,7 @@ function handleError($error)
     exit(-1);
 }
 
-function checkMirror($action_obj)
+function checkMirror($action_obj, $args)
 {
     global $config;
 
@@ -198,7 +198,7 @@ function main()
     } else {
         $action_obj = new $action_class();
 
-        checkMirror($action_obj);
+        checkMirror($action_obj, $args);
 
         try {
             if ($action_obj->prepare($args)) {
diff --git a/lib/servererroraction.php b/lib/servererroraction.php
index db7352166..c46f3228b 100644
--- a/lib/servererroraction.php
+++ b/lib/servererroraction.php
@@ -52,6 +52,7 @@ require_once INSTALLDIR.'/lib/error.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://laconi.ca/
  */
+
 class ServerErrorAction extends ErrorAction
 {
     function __construct($message='Error', $code=500)
@@ -66,6 +67,10 @@ class ServerErrorAction extends ErrorAction
                                505 => 'HTTP Version Not Supported');
 
         $this->default = 500;
+
+        // Server errors must be logged.
+
+        common_log(LOG_ERR, "ServerErrorAction: $code $message");
     }
 
     // XXX: Should these error actions even be invokable via URI?