diff options
author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-04-26 23:44:22 +0200 |
---|---|---|
committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-04-26 23:44:22 +0200 |
commit | 6fb427d151ed18622b86453581cc22989715ddc3 (patch) | |
tree | fa8f66d03745652c508029d0ca77537f37230dfc /system/core/URI.php | |
parent | 79ac3d1f6e21d199971471586df22011206f868a (diff) | |
parent | f59bb1ac944dfaed23150ffd452ce5bca9f5f5c0 (diff) |
Merge pull request #1266 from timw4mail/patch
Normalize comments in core files
Diffstat (limited to 'system/core/URI.php')
-rwxr-xr-x | system/core/URI.php | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/system/core/URI.php b/system/core/URI.php index 17300df07..705575a0c 100755 --- a/system/core/URI.php +++ b/system/core/URI.php @@ -24,8 +24,6 @@ * @since Version 1.0 */ -// ------------------------------------------------------------------------ - /** * URI Class * @@ -44,26 +42,29 @@ class CI_URI { * * @var array */ - public $keyval = array(); + public $keyval = array(); + /** * Current uri string * * @var string */ public $uri_string; + /** * List of uri segments * * @var array */ - public $segments = array(); + public $segments = array(); + /** * Re-indexed list of uri segments * Starts at 1 instead of 0 * * @var array */ - public $rsegments = array(); + public $rsegments = array(); /** * Constructor @@ -326,6 +327,7 @@ class CI_URI { } // -------------------------------------------------------------------- + /** * Re-index Segments * @@ -406,6 +408,9 @@ class CI_URI { { return $this->_uri_to_assoc($n, $default, 'segment'); } + + // -------------------------------------------------------------------- + /** * Identical to above only it uses the re-routed segment array * @@ -501,7 +506,6 @@ class CI_URI { /** * Generate a URI string from an associative array * - * * @param array an associative array of key/values * @return array */ |