From: Evan Prodromou <evan@status.net>
Date: Fri, 26 Nov 2010 16:18:41 +0000 (-0500)
Subject: Revert "Ticket #2796: don't allow arbitrary overriding of the 'action' class and... 
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=806832e3392d6f2a824bc368dae4bc2831da39fa;p=quix0rs-gnu-social.git

Revert "Ticket #2796: don't allow arbitrary overriding of the 'action' class and other parameters pulled from the URL mapper."

This reverts commit 4193a826d3500c1c8771e2a55ca197011fe637c8.
---

diff --git a/index.php b/index.php
index 6079d1f2c4..9501e2275d 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));