diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-12-07 11:12:44 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-12-07 11:13:20 +0100 |
| commit | f0f93f50d2a85373988a225504115d4805446189 (patch) | |
| tree | 0c3499a7883991cca1fcfea3c08bf1e63576b693 /system/core | |
| parent | a18c6097a38f7b3eac789b5c217a97d7ac0b7085 (diff) | |
Merge pull request #4291 from b-kaxa/fix-phpdoc
[ci skip] phpdoc adjustments in CI_Router and CI_URI
Diffstat (limited to 'system/core')
| -rw-r--r-- | system/core/Router.php | 1 | ||||
| -rw-r--r-- | system/core/URI.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/system/core/Router.php b/system/core/Router.php index a84be1f1d..ce41aa958 100644 --- a/system/core/Router.php +++ b/system/core/Router.php @@ -118,6 +118,7 @@ class CI_Router { * * Runs the route mapping function. * + * @param array $routing * @return void */ public function __construct($routing = NULL) diff --git a/system/core/URI.php b/system/core/URI.php index 5b658f679..5179b401f 100644 --- a/system/core/URI.php +++ b/system/core/URI.php @@ -294,7 +294,7 @@ class CI_URI { * * Do some final cleaning of the URI and return it, currently only used in self::_parse_request_uri() * - * @param string $url + * @param string $uri * @return string */ protected function _remove_relative_directory($uri) |