summaryrefslogtreecommitdiff
path: root/index.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-08-24 11:28:16 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-08-24 11:28:16 -0400
commit77f303c2be138aee34955e2a737bd9cb31caa2d4 (patch)
tree5d05446a8e16bdec79ba245adaeb326b268f2378 /index.php
parent7a61b0737d00adbdaaea7e82fa3a1702286332aa (diff)
parenta0f6b4f078252389eacf53dce1c5ca10951c76ac (diff)
Merge branch 'master' into testing
Conflicts: lib/rssaction.php lib/twitterapi.php
Diffstat (limited to 'index.php')
-rw-r--r--index.php4
1 files changed, 2 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)) {