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

Fixing issue where actions starting with a prefix but not followed by an _ would get mangled when going through router::url().

Browse source 
Fixes #1556
This commit is contained in:
mark_story 2011-02-24 16:43:13 -05:00
parent 139d6b3133
commit e05c6cd83f
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cake/libs/router.php
View file

@ -822,7 +822,7 @@ class Router {
} elseif (isset($url[$prefix]) && !$url[$prefix]) { } elseif (isset($url[$prefix]) && !$url[$prefix]) {
unset($url[$prefix]); unset($url[$prefix]);
} }
if (isset($url[$prefix]) && strpos($url['action'], $prefix) === 0) { if (isset($url[$prefix]) && strpos($url['action'], $prefix . '_') === 0) {
$url['action'] = substr($url['action'], strlen($prefix) + 1); $url['action'] = substr($url['action'], strlen($prefix) + 1);
} }
} }

4
cake/tests/cases/libs/router.test.php
View file

@ -1514,6 +1514,10 @@ class RouterTest extends CakeTestCase {
$expected = '/protected/images/edit/1'; $expected = '/protected/images/edit/1';
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);
$result = Router::url(array('action' => 'protectededit', 1, 'protected' => true));
$expected = '/protected/images/protectededit/1';
$this->assertEqual($result, $expected);
$result = Router::url(array('action' => 'edit', 1, 'protected' => true)); $result = Router::url(array('action' => 'edit', 1, 'protected' => true));
$expected = '/protected/images/edit/1'; $expected = '/protected/images/edit/1';
$this->assertEqual($result, $expected); $this->assertEqual($result, $expected);