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

Renaming parameters.

Browse source
This commit is contained in:
mark_story 2009-12-03 20:32:28 -05:00
parent aff7d61277
commit 218af686d7
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cake/libs/router.php
View file

@ -251,9 +251,9 @@ class Router {
* Patterns for routing parameters do not need capturing groups, as one will be added for each route params. * Patterns for routing parameters do not need capturing groups, as one will be added for each route params.
* *
* @param string $route A string describing the template of the route * @param string $route A string describing the template of the route
* @param array $default An array describing the default route parameters. These parameters will be used by default * @param array $defaults An array describing the default route parameters. These parameters will be used by default
* and can supply routing parameters that are not dynamic. See above. * and can supply routing parameters that are not dynamic. See above.
* @param array $params An array matching the named elements in the route to regular expressions which that * @param array $options An array matching the named elements in the route to regular expressions which that
* element should match. Also contains additional parameters such as which routed parameters should be * element should match. Also contains additional parameters such as which routed parameters should be
* shifted into the passed arguments. As well as supplying patterns for routing parameters. * shifted into the passed arguments. As well as supplying patterns for routing parameters.
* @see routes * @see routes
@ -261,21 +261,21 @@ class Router {
* @access public * @access public
* @static * @static
*/ */
function connect($route, $default = array(), $params = array()) { function connect($route, $defaults = array(), $options = array()) {
$self =& Router::getInstance(); $self =& Router::getInstance();
foreach ($self->__prefixes as $prefix) { foreach ($self->__prefixes as $prefix) {
if (isset($default[$prefix])) { if (isset($defaults[$prefix])) {
$default['prefix'] = $prefix; $defaults['prefix'] = $prefix;
break; break;
} }
} }
if (isset($default['prefix'])) { if (isset($defaults['prefix'])) {
$self->__prefixes[] = $default['prefix']; $self->__prefixes[] = $defaults['prefix'];
$self->__prefixes = array_keys(array_flip($self->__prefixes)); $self->__prefixes = array_keys(array_flip($self->__prefixes));
} }
$default += array('action' => 'index', 'plugin' => null, 'controller' => null); $defaults += array('action' => 'index', 'plugin' => null, 'controller' => null);
$self->routes[] =& new RouterRoute($route, $default, $params); $self->routes[] =& new RouterRoute($route, $defaults, $options);
return $self->routes; return $self->routes;
} }