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

updating dispatcher related to #3856, test added

Browse source 
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6408 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
gwoo 2008-01-24 21:19:13 +00:00
parent f598b58465
commit ebeb7d0f94
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/dispatcher.php
View file

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

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

@ -372,6 +372,14 @@ class DispatcherTest extends UnitTestCase {
$result = $Dispatcher->getUrl($uri); $result = $Dispatcher->getUrl($uri);
$expected = 'students/browse'; $expected = 'students/browse';
$this->assertEqual($expected, $result); $this->assertEqual($expected, $result);
$_GET['url'] = array();
$Dispatcher =& new Dispatcher();
$Dispatcher->base = '';
$uri = '/?/home';
$result = $Dispatcher->getUrl($uri);
$expected = '?/home';
$this->assertEqual($expected, $result);
} }
function testBaseUrlAndWebrootWithModRewrite() { function testBaseUrlAndWebrootWithModRewrite() {