summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-11-26 11:18:41 -0500
committerEvan Prodromou <evan@status.net>2010-11-26 11:18:41 -0500
commit806832e3392d6f2a824bc368dae4bc2831da39fa (patch)
treef1cc44879341618ca34d8e3ce2c4ca39cedba307
parentc0ce953288db5a3c632184f68f81db135eff0250 (diff)
Revert "Ticket #2796: don't allow arbitrary overriding of the 'action' class and other parameters pulled from the URL mapper."
This reverts commit 4193a826d3500c1c8771e2a55ca197011fe637c8.
-rw-r--r--index.php6
1 files changed, 1 insertions, 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));