Merge branch 'master' into 0.9.x

Conflicts:
	lib/router.php

1 files changed, 1 insertions, 5 deletions

diff --git a/index.php b/index.php
index b060a3d52..049d46afc 100644
--- a/index.php
+++ b/index.php
@@ -272,11 +272,7 @@ function main()
         return;
     }
 
-    // Note the order here: arguments from the URL mapper will
-    // override request params that have been sent. This ensures
-    // that for instance an action parameter can't be overridden
-    // with an arbitrary action class.
-    $args = array_merge($_REQUEST, $args);
+    $args = array_merge($args, $_REQUEST);
 
     Event::handle('ArgsInitialize', array(&$args));