GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'master' into testing

Browse Source 
Conflicts:
	lib/rssaction.php
	lib/twitterapi.php
This commit is contained in:
Evan Prodromou 2009-08-24 11:28:16 -04:00
commit 77f303c2be
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
index.php
View File

@ -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)) {

5
lib/servererroraction.php
View File

@ -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?