diff options
author | Florian Pritz <bluewind@xinu.at> | 2011-08-21 17:09:54 +0200 |
---|---|---|
committer | Florian Pritz <bluewind@xinu.at> | 2011-08-21 17:09:54 +0200 |
commit | 9f52b09abe8dd2919cf9b5d22d12abb0203eb8a8 (patch) | |
tree | fd94ba9616ccc4cfbdb3ecfddece0ce2fa1bba24 /system/core/URI.php | |
parent | caec47b75d132b98a1b251448a46d3756d05c7b8 (diff) | |
parent | c09370bebb08082ab0655a964a6e6e1331ed47fb (diff) |
Merge branch 'working'
Diffstat (limited to 'system/core/URI.php')
-rwxr-xr-x | system/core/URI.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/system/core/URI.php b/system/core/URI.php index b34260836..80572ddd1 100755 --- a/system/core/URI.php +++ b/system/core/URI.php @@ -62,7 +62,7 @@ class CI_URI { if (strtoupper($this->config->item('uri_protocol')) == 'AUTO') { // Is the request coming from the command line? - if (defined('STDIN')) + if (php_sapi_name() == 'cli' or defined('STDIN')) { $this->_set_uri_string($this->_parse_cli_args()); return; @@ -120,7 +120,7 @@ class CI_URI { $path = (isset($_SERVER[$uri])) ? $_SERVER[$uri] : @getenv($uri); $this->_set_uri_string($path); } - + // -------------------------------------------------------------------- /** @@ -133,7 +133,7 @@ class CI_URI { { // Filter out control characters $str = remove_invisible_characters($str, FALSE); - + // If the URI contains only a slash we'll kill it $this->uri_string = ($str == '/') ? '' : $str; } @@ -151,7 +151,7 @@ class CI_URI { */ private function _detect_uri() { - if ( ! isset($_SERVER['REQUEST_URI'])) + if ( ! isset($_SERVER['REQUEST_URI']) OR ! isset($_SERVER['SCRIPT_NAME'])) { return ''; } @@ -184,12 +184,12 @@ class CI_URI { $_SERVER['QUERY_STRING'] = ''; $_GET = array(); } - + if ($uri == '/' || empty($uri)) { return '/'; } - + $uri = parse_url($uri, PHP_URL_PATH); // Do some final cleaning of the URI and return it |