tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-02 14:18:46 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2435 from hafriedlander/fix/join_links_query_params

Browse Source 
FIX Use last of duplicate query params in join_links
This commit is contained in:
Ingo Schommer 2013-09-20 02:27:49 -07:00
commit 5b3f8bc04d
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
control/Controller.php
View File

@ -552,8 +552,9 @@ class Controller extends RequestHandler implements TemplateGlobalProvider {
public static function join_links() {
$args = func_get_args();
$result = "";
$querystrings = array();
$queryargs = array();
$fragmentIdentifier = null;
foreach($args as $arg) {
// Find fragment identifier - keep the last one
if(strpos($arg,'#') !== false) {
@ -562,7 +563,8 @@ class Controller extends RequestHandler implements TemplateGlobalProvider {
// Find querystrings
if(strpos($arg,'?') !== false) {
list($arg, $suffix) = explode('?',$arg,2);
$querystrings[] = $suffix;
parse_str($suffix, $localargs);
$queryargs = array_merge($queryargs, $localargs);
}
if((is_string($arg) && $arg) || is_numeric($arg)) {
$arg = (string)$arg;
@ -571,7 +573,8 @@ class Controller extends RequestHandler implements TemplateGlobalProvider {
}
}
if($querystrings) $result .= '?' . implode('&', $querystrings);
if($queryargs) $result .= '?' . http_build_query($queryargs);
if($fragmentIdentifier) $result .= "#$fragmentIdentifier";
return $result;

6
tests/control/ControllerTest.php
View File

@ -236,9 +236,9 @@ class ControllerTest extends FunctionalTest {
$this->assertEquals("admin/crm?existing=1&flush=1", Controller::join_links("admin/crm?existing=1", "?flush=1"));
$this->assertEquals("admin/crm/MyForm?a=1&b=2&c=3",
Controller::join_links("?a=1", "admin/crm", "?b=2", "MyForm?c=3"));
/* Note, however, that it doesn't deal with duplicates very well. */
$this->assertEquals("admin/crm?flush=1&flush=1", Controller::join_links("admin/crm?flush=1", "?flush=1"));
// And duplicates are handled nicely
$this->assertEquals("admin/crm?foo=2&bar=3&baz=1", Controller::join_links("admin/crm?foo=1&bar=1&baz=1", "?foo=2&bar=3"));
$this->assertEquals (
'admin/action', Controller::join_links('admin/', '/', '/action'), 'Test that multiple slashes are trimmed.'