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

Merge pull request #2799 from sam-at-github/master

Browse source 
Fixed prefixed action prefix reverse routing match. One liner.
This commit is contained in:
Mark Story 2014-02-09 16:02:44 -05:00
commit 6b3a062927
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Routing/Route/CakeRoute.php
View file

@ -490,7 +490,7 @@ class CakeRoute {
$prefixed = $params['prefix'] . '_'; $prefixed = $params['prefix'] . '_';
} }
if (isset($prefixed, $params['action']) && strpos($params['action'], $prefixed) === 0) { if (isset($prefixed, $params['action']) && strpos($params['action'], $prefixed) === 0) {
$params['action'] = substr($params['action'], strlen($prefixed) * -1); $params['action'] = substr($params['action'], strlen($prefixed));
unset($params['prefix']); unset($params['prefix']);
} }

5
lib/Cake/Test/Case/Routing/Route/CakeRouteTest.php
View file

@ -308,6 +308,11 @@ class CakeRouteTest extends CakeTestCase {
$result = $route->match($url); $result = $route->match($url);
$expected = '/admin/subscriptions/edit_admin_e/1'; $expected = '/admin/subscriptions/edit_admin_e/1';
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
$url = array('controller' => 'subscribe', 'admin' => true, 'action' => 'admin_edit', 1);
$result = $route->match($url);
$expected = '/admin/subscriptions/edit/1';
$this->assertEquals($expected, $result);
} }
/** /**