tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

BUGFIX Type-safe checks for Controller::join_links(), allowing arguments with a value of "0"

Browse Source
This commit is contained in:
Ingo Schommer 2012-03-08 21:41:17 +01:00
parent 46a3bbf7ba
commit f9323b398c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
control/Controller.php
View File

@ -572,7 +572,8 @@ class Controller extends RequestHandler implements TemplateGlobalProvider {
list($arg, $suffix) = explode('?',$arg,2); list($arg, $suffix) = explode('?',$arg,2);
$querystrings[] = $suffix; $querystrings[] = $suffix;
} }
if($arg) { if((is_string($arg) && $arg) || is_numeric($arg)) {
$arg = (string)$arg;
if($result && substr($result,-1) != '/' && $arg[0] != '/') $result .= "/$arg"; if($result && substr($result,-1) != '/' && $arg[0] != '/') $result .= "/$arg";
else $result .= (substr($result, -1) == '/' && $arg[0] == '/') ? ltrim($arg, '/') : $arg; else $result .= (substr($result, -1) == '/' && $arg[0] == '/') ? ltrim($arg, '/') : $arg;
} }

3
tests/control/ControllerTest.php
View File

@ -108,6 +108,9 @@ class ControllerTest extends FunctionalTest {
/* If there are multiple, it takes the last one */ /* If there are multiple, it takes the last one */
$this->assertEquals("my-page?arg=var#second-section", Controller::join_links("my-page#subsection", "?arg=var", "#second-section")); $this->assertEquals("my-page?arg=var#second-section", Controller::join_links("my-page#subsection", "?arg=var", "#second-section"));
/* Does type-safe checks for zero value */
$this->assertEquals("my-page/0", Controller::join_links("my-page", 0));
} }
/** /**