tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-01 00:49:33 +02:00
Code Issues Projects Releases Wiki Activity

Allow querystrings in arguments passed to Controller::join_links()

Browse Source 
Fix FormField::Link() to allow querystrings in the form's action


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@61064 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2008-08-19 10:06:43 +00:00
parent 23d6fb8952
commit 292140897a
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/control/Controller.php
View File

@ -458,16 +458,24 @@ class Controller extends RequestHandlingData {
/** /**
* Joins two link segments together, putting a slash between them if necessary. * Joins two link segments together, putting a slash between them if necessary.
* Use this for building the results of Link() methods. * Use this for building the results of Link() methods.
*
* If either of the links have query strings, then they will be combined and put at the end of the resulting url.
*/ */
static function join_links() { static function join_links() {
$args = func_get_args(); $args = func_get_args();
$result = "";
$result = array_shift($args); $querystrings = array();
foreach($args as $arg) { foreach($args as $arg) {
if(substr($result,-1) != '/' && $arg[0] != '/') $result .= "/$arg"; if(strpos($arg,'?') !== false) {
list($arg, $suffix) = explode('?',$arg,2);
$querystrings[] = $suffix;
}
if($result && substr($result,-1) != '/' && $arg[0] != '/') $result .= "/$arg";
else $result .= $arg; else $result .= $arg;
} }
if($querystrings) $result .= '?' . implode('&', $querystrings);
return $result; return $result;
} }
} }

2
forms/FormField.php
View File

@ -74,7 +74,7 @@ class FormField extends RequestHandlingData {
* Return a Link to this field * Return a Link to this field
*/ */
function Link() { function Link() {
return $this->form->FormAction() . '/field/' . $this->name; return Controller::join_links($this->form->FormAction(), 'field/' . $this->name);
} }
/** /**