Commit 806832e3 authored by Evan Prodromou's avatar Evan Prodromou

Revert "Ticket #2796: don't allow arbitrary overriding of the 'action' class...

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

This reverts commit 4193a826.
parent c0ce9532
......@@ -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));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment