tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-29 07:59:31 +02:00
Code Issues Projects Releases Wiki Activity

Include baseURL with relative setGetVar() links (#8834)

Browse Source 
* Return baseURL with setGetVar

* Adjust testSetGetVar tests for base url
This commit is contained in:
Ralph Slooten 2019-04-15 14:50:46 +12:00 committed by Aaron Carlino
parent 2c971eea83
commit 66c372ce28
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Control/HTTP.php
View File

@ -268,7 +268,7 @@ class HTTP
$newUri = $scheme . '://' . $user . $host . $port . $path . $params . $fragment; $newUri = $scheme . '://' . $user . $host . $port . $path . $params . $fragment;
if ($isRelative) { if ($isRelative) {
return Director::makeRelative($newUri); return Director::baseURL() . Director::makeRelative($newUri);
} }
return $newUri; return $newUri;

4
tests/php/Control/HTTPTest.php
View File

@ -246,13 +246,13 @@ class HTTPTest extends FunctionalTest
}, 'relative/url/'); }, 'relative/url/');
$this->assertEquals( $this->assertEquals(
'relative/url?foo=bar', '/relative/url?foo=bar',
HTTP::setGetVar('foo', 'bar', 'relative/url'), HTTP::setGetVar('foo', 'bar', 'relative/url'),
'Relative URL without existing query params' 'Relative URL without existing query params'
); );
$this->assertEquals( $this->assertEquals(
'relative/url?baz=buz&foo=bar', '/relative/url?baz=buz&foo=bar',
HTTP::setGetVar('foo', 'bar', '/relative/url?baz=buz'), HTTP::setGetVar('foo', 'bar', '/relative/url?baz=buz'),
'Relative URL with existing query params, and new added key' 'Relative URL with existing query params, and new added key'
); );