diff options
author | Timothy Warren <tim@timshomepage.net> | 2012-05-17 14:02:21 +0200 |
---|---|---|
committer | Timothy Warren <tim@timshomepage.net> | 2012-05-17 14:02:21 +0200 |
commit | e8e09039b49ac5883e9e94162579841375e13c69 (patch) | |
tree | c206119bbc5bdcd573b56609b6450b14e6c20dcb /system/core/Router.php | |
parent | 43c216b998ccf8c8208b237e9e0d9c468c8a82e5 (diff) | |
parent | ae31eb5e75d914fc3ab622a7ac5c23eb1e6d9f9a (diff) |
Merge upstream
Diffstat (limited to 'system/core/Router.php')
-rwxr-xr-x | system/core/Router.php | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/system/core/Router.php b/system/core/Router.php index 9314052fe..5ea13797b 100755 --- a/system/core/Router.php +++ b/system/core/Router.php @@ -32,8 +32,8 @@ * * @package CodeIgniter * @subpackage Libraries - * @author EllisLab Dev Team * @category Libraries + * @author EllisLab Dev Team * @link http://codeigniter.com/user_guide/general/routing.html */ class CI_Router { @@ -44,42 +44,42 @@ class CI_Router { * @var object */ public $config; - + /** * List of routes * * @var array */ public $routes = array(); - + /** * List of error routes * * @var array */ public $error_routes = array(); - + /** * Current class name * * @var string */ - public $class = ''; - + public $class = ''; + /** * Current method name * * @var string */ public $method = 'index'; - + /** * Sub-directory that contains the requested controller class * * @var string */ public $directory = ''; - + /** * Default controller (and method if specific) * @@ -91,6 +91,8 @@ class CI_Router { * Constructor * * Runs the route mapping function. + * + * @return void */ public function __construct() { @@ -433,12 +435,7 @@ class CI_Router { */ public function fetch_method() { - if ($this->method == $this->fetch_class()) - { - return 'index'; - } - - return $this->method; + return ($this->method == $this->fetch_class()) ? 'index' : $this->method; } // -------------------------------------------------------------------- |