adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tweak fix from #8359

Browse source 
This fixes a regression introduced in that change that we didn't
previously have tests for. The issue fixed in #8359 was related to
PHP7.0, whereas PHP5 didn't have an issue. Now both versions will work
the same.
This commit is contained in:
mark_story 2016-03-02 12:30:48 -05:00
parent 63de5ca4ea
commit 3ad68db5eb
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/Cake/Network/CakeRequest.php
View file

@ -448,7 +448,10 @@ class CakeRequest implements ArrayAccess {
if (!empty($ref) && !empty($base)) {
if ($local && strpos($ref, $base) === 0) {
$ref = substr($ref, strlen($base));
if (isset($ref[0]) && $ref[0] !== '/') {
if (empty($ref)) {
$ref = '/';
}
if ($ref[0] !== '/') {
$ref = '/' . $ref;
}
return $ref;

4
lib/Cake/Test/Case/Network/CakeRequestTest.php
View file

@ -742,6 +742,10 @@ class CakeRequestTest extends CakeTestCase {
$result = $request->referer();
$this->assertSame($result, '/');
$_SERVER['HTTP_REFERER'] = Configure::read('App.fullBaseUrl') . '/';
$result = $request->referer(true);
$this->assertSame($result, '/');
$_SERVER['HTTP_REFERER'] = Configure::read('App.fullBaseUrl') . '/some/path';
$result = $request->referer(true);
$this->assertSame($result, '/some/path');