Fix coding standards in Config/

This commit is contained in:
mark_story 2012-03-03 17:35:47 -05:00
parent 04c843b17b
commit b06e15ce6f

View file

@ -45,9 +45,9 @@
* *
* You can disable the connection of default routes by deleting the require inside APP/Config/routes.php. * You can disable the connection of default routes by deleting the require inside APP/Config/routes.php.
*/ */
$prefixes = Router::prefixes(); $prefixes = Router::prefixes();
if ($plugins = CakePlugin::loaded()) { if ($plugins = CakePlugin::loaded()) {
App::uses('PluginShortRoute', 'Routing/Route'); App::uses('PluginShortRoute', 'Routing/Route');
foreach ($plugins as $key => $value) { foreach ($plugins as $key => $value) {
$plugins[$key] = Inflector::underscore($value); $plugins[$key] = Inflector::underscore($value);
@ -66,21 +66,21 @@
Router::connect('/:plugin', array('action' => 'index'), $shortParams); Router::connect('/:plugin', array('action' => 'index'), $shortParams);
Router::connect('/:plugin/:controller', array('action' => 'index'), $match); Router::connect('/:plugin/:controller', array('action' => 'index'), $match);
Router::connect('/:plugin/:controller/:action/*', array(), $match); Router::connect('/:plugin/:controller/:action/*', array(), $match);
} }
foreach ($prefixes as $prefix) { foreach ($prefixes as $prefix) {
$params = array('prefix' => $prefix, $prefix => true); $params = array('prefix' => $prefix, $prefix => true);
$indexParams = $params + array('action' => 'index'); $indexParams = $params + array('action' => 'index');
Router::connect("/{$prefix}/:controller", $indexParams); Router::connect("/{$prefix}/:controller", $indexParams);
Router::connect("/{$prefix}/:controller/:action/*", $params); Router::connect("/{$prefix}/:controller/:action/*", $params);
} }
Router::connect('/:controller', array('action' => 'index')); Router::connect('/:controller', array('action' => 'index'));
Router::connect('/:controller/:action/*'); Router::connect('/:controller/:action/*');
$namedConfig = Router::namedConfig(); $namedConfig = Router::namedConfig();
if ($namedConfig['rules'] === false) { if ($namedConfig['rules'] === false) {
Router::connectNamed(true); Router::connectNamed(true);
} }
unset($namedConfig, $params, $indexParams, $prefix, $prefixes, $shortParams, $match, unset($namedConfig, $params, $indexParams, $prefix, $prefixes, $shortParams, $match,
$pluginPattern, $plugins, $key, $value); $pluginPattern, $plugins, $key, $value);