summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-12-07 11:12:44 +0100
committerAndrey Andreev <narf@devilix.net>2015-12-07 11:12:44 +0100
commitc83cfe8f9bdaf8fc7d9af2a392c7514ba612fec9 (patch)
tree90c7e0ab59b5bc88d57e393a72519e1254e7f5c3 /system
parent115c99e877fee718d91910dd443b3403fc913a96 (diff)
parent887eb91ff2799036a6d899ee3dbadd8a6a51ff54 (diff)
Merge pull request #4291 from b-kaxa/fix-phpdoc
[ci skip] phpdoc adjustments in CI_Router and CI_URI
Diffstat (limited to 'system')
-rw-r--r--system/core/Router.php1
-rw-r--r--system/core/URI.php2
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)