GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'master' into 0.9.x

Browse Source
This commit is contained in:
Brion Vibber 2010-11-19 15:38:20 -08:00
commit 0dcfcbd517
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
index.php
View File

@ -272,7 +272,11 @@ function main()
return; return;
} }
$args = array_merge($args, $_REQUEST); // 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);
Event::handle('ArgsInitialize', array(&$args)); Event::handle('ArgsInitialize', array(&$args));