adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-06 03:22:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed bug where Dispatcher::getUrl() returned incorrect URL if $base appeared in a $uri besides at start of $uri.

Browse source
This commit is contained in:
ADmad 2010-11-24 01:43:10 +05:30
parent d5fb0b25cb
commit b567de977e
2 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cake/dispatcher.php
View file

@ -483,8 +483,8 @@ class Dispatcher extends Object {
if ($tmpUri === '/' || $tmpUri == $baseDir || $tmpUri == $base) {
$url = $_GET['url'] = '/';
} else {
if ($base && strpos($uri, $base) !== false) {
$elements = explode($base, $uri);
if ($base && strpos($uri, $base) === 0) {
$elements = explode($base, $uri, 2);
} elseif (preg_match('/^[\/\?\/|\/\?|\?\/]/', $uri)) {
$elements = array(1 => preg_replace('/^[\/\?\/|\/\?|\?\/]/', '', $uri));
} else {

7
cake/tests/cases/dispatcher.test.php
View file

@ -1017,6 +1017,13 @@ class DispatcherTest extends CakeTestCase {
$expected = '?/home';
$this->assertEqual($expected, $result);
$_GET['url'] = array();
$Dispatcher =& new Dispatcher();
$Dispatcher->base = '/shop';
$uri = '/shop/fr/pages/shop';
$result = $Dispatcher->getUrl($uri);
$expected = 'fr/pages/shop';
$this->assertEqual($expected, $result);
}
/**