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

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
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cake/dispatcher.php
View file

@ -82,7 +82,7 @@ class Dispatcher extends Object {
}
/**
* Dispatches and invokes given URL, handing over control to the involved controllers, and then renders the
* Dispatches and invokes given URL, handing over control to the involved controllers, and then renders the
* results (if autoRender is set).
*
* If no controller of given name can be found, invoke() shows error messages in
@ -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 {
@ -560,7 +560,7 @@ class Dispatcher extends Object {
}
$filters = Configure::read('Asset.filter');
$isCss = (
strpos($url, 'ccss/') === 0 ||
strpos($url, 'ccss/') === 0 ||
preg_match('#^(theme/([^/]+)/ccss/)|(([^/]+)(?<!css)/ccss)/#i', $url)
);
$isJs = (

21
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);
}
/**
@ -1367,11 +1374,11 @@ class DispatcherTest extends CakeTestCase {
$url = 'test_dispatch_pages/camelCased';
$controller = $Dispatcher->dispatch($url, array('return' => 1));
$this->assertEqual('TestDispatchPages', $controller->name);
$url = 'test_dispatch_pages/camelCased/something. .';
$controller = $Dispatcher->dispatch($url, array('return' => 1));
$this->assertEqual($controller->params['pass'][0], 'something. .', 'Period was chopped off. %s');
}
/**
@ -1395,7 +1402,7 @@ class DispatcherTest extends CakeTestCase {
$expected = array('0' => 'home', 'param' => 'value', 'param2' => 'value2');
$this->assertIdentical($expected, $controller->passedArgs);
$this->assertEqual($Dispatcher->base . '/pages/display/home/param:value/param2:value2', $Dispatcher->here);
}
@ -1441,7 +1448,7 @@ class DispatcherTest extends CakeTestCase {
Router::reload();
$Dispatcher =& new TestDispatcher();
Router::connect(
'/my_plugin/:controller/*',
'/my_plugin/:controller/*',
array('plugin' => 'my_plugin', 'controller' => 'pages', 'action' => 'display')
);
@ -1598,7 +1605,7 @@ class DispatcherTest extends CakeTestCase {
'action' => 'admin_index',
'prefix' => 'admin',
'admin' => true,
'form' => array(),
'form' => array(),
'url' => array('url' => 'admin/articles_test'),
'return' => 1
);
@ -1980,7 +1987,7 @@ class DispatcherTest extends CakeTestCase {
}
/**
* test that asset filters work for theme and plugin assets
* test that asset filters work for theme and plugin assets
*
* @return void
*/
@ -2008,7 +2015,7 @@ class DispatcherTest extends CakeTestCase {
$Dispatcher->stopped = false;
$Dispatcher->asset('css/ccss/debug_kit.css');
$this->assertFalse($Dispatcher->stopped);
$Dispatcher->stopped = false;
$Dispatcher->asset('js/cjs/debug_kit.js');
$this->assertFalse($Dispatcher->stopped);