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

Merge branch 'master' into 2.5

Browse source 
Conflicts:
	lib/Cake/Routing/Router.php
This commit is contained in:
mark_story 2013-12-08 21:25:59 -05:00
commit 48d2618c62
8 changed files with 125 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/Cake/Routing/Router.php
View file

@ -506,6 +506,12 @@ class Router {
$prefix = $options['prefix'];
$connectOptions = $options['connectOptions'];
unset($options['connectOptions']);
if (strpos($prefix, '/') !== 0) {
$prefix = '/' . $prefix;
}
if (substr($prefix, -1) !== '/') {
$prefix .= '/';
}
foreach ((array)$controller as $name) {
list($plugin, $name) = pluginSplit($name);