summaryrefslogtreecommitdiffstats
path: root/system/core/URI.php
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2011-08-20 15:59:15 +0200
committerDerek Jones <derek.jones@ellislab.com>2011-08-20 15:59:15 +0200
commitd9489e0ca676905c16c7a8c0f03011cc12b634f9 (patch)
tree809872634daf234591fabacbca8df2203d35b509 /system/core/URI.php
parentabccc2fa65eea5f64773952661a8ba79e559333b (diff)
parentb8c038a3e7742f32915d7f1ab69627075e8d0c39 (diff)
Merge branch 'release/v2.0.3'
Diffstat (limited to 'system/core/URI.php')
-rw-r--r--system/core/URI.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/URI.php b/system/core/URI.php
index d56548654..20f0f006b 100644
--- 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;