summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorPhil Sturgeon <email@philsturgeon.co.uk>2011-08-13 19:06:57 +0200
committerPhil Sturgeon <email@philsturgeon.co.uk>2011-08-13 19:27:42 +0200
commitfe1d45a023b08753f4c5f1d908d54ae842277558 (patch)
tree1e05aba728d0d6ad9b25dcd5750604db5ff4518e /system/core
parent99f6c8c4d71714e62a86cee5d2f7fbfa496a3c5a (diff)
Fixed conflicts.
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Input.php2
-rw-r--r--system/core/URI.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/system/core/Input.php b/system/core/Input.php
index dc7612e64..cfbef942d 100644
--- a/system/core/Input.php
+++ b/system/core/Input.php
@@ -672,7 +672,7 @@ class CI_Input {
*/
public function is_cli_request()
{
- return (bool) defined('STDIN');
+ return (php_sapi_name() == 'cli') or defined('STDIN');
}
}
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;