From 806832e3392d6f2a824bc368dae4bc2831da39fa Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 26 Nov 2010 11:18:41 -0500
Subject: Revert "Ticket #2796: don't allow arbitrary overriding of the
 'action' class and other parameters pulled from the URL mapper."

This reverts commit 4193a826d3500c1c8771e2a55ca197011fe637c8.
---
 index.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/index.php b/index.php
index 6079d1f2c..9501e2275 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));
 
-- 
cgit v1.2.3-54-g00ecf