From 025ba238863cb52c51ce916491f3da11c6010a03 Mon Sep 17 00:00:00 2001 From: mark_story Date: Sun, 19 Dec 2010 20:05:57 -0500 Subject: [PATCH] Removing whitespace and adding some more documentation. --- cake/libs/router.php | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/cake/libs/router.php b/cake/libs/router.php index f4cfa32fd..8d76a7ba5 100644 --- a/cake/libs/router.php +++ b/cake/libs/router.php @@ -300,7 +300,9 @@ class Router { } /** - * Specifies what named parameters CakePHP should be parsing. The most common setups are: + * Specifies what named parameters CakePHP should be parsing out of incoming urls. By default + * CakePHP will parse every named parameter out of incoming URLs. However, if you want to take more + * control over how named parameters are parsed you can use one of the following setups: * * Do not parse any named parameters: * @@ -342,8 +344,6 @@ class Router { * @return array */ public static function connectNamed($named, $options = array()) { - - if (isset($options['argSeparator'])) { self::$named['separator'] = $options['argSeparator']; unset($options['argSeparator']); @@ -385,7 +385,6 @@ class Router { * @return void */ public static function defaults($connect = true) { - self::$_connectDefaults = $connect; } @@ -403,7 +402,6 @@ class Router { * @return array Array of mapped resources */ public static function mapResources($controller, $options = array()) { - $options = array_merge(array('prefix' => '/', 'id' => self::$__named['ID'] . '|' . self::$__named['UUID']), $options); $prefix = $options['prefix']; @@ -430,7 +428,6 @@ class Router { * @return array A list of prefixes used in connected routes */ public static function prefixes() { - return self::$_prefixes; } @@ -441,8 +438,6 @@ class Router { * @return array Parsed elements from URL */ public static function parse($url) { - - if (!self::$_defaultsMapped && self::$_connectDefaults) { self::__connectDefaultRoutes(); }