commit fe1d45a023b08753f4c5f1d908d54ae842277558
author Phil Sturgeon <email@philsturgeon.co.uk> Sat Aug 13 11:06:57 2011 -0600
committer Phil Sturgeon <email@philsturgeon.co.uk> Sat Aug 13 11:27:42 2011 -0600
tree 1e05aba728d0d6ad9b25dcd5750604db5ff4518e
parent 99f6c8c4d71714e62a86cee5d2f7fbfa496a3c5a

Fixed conflicts.

system/core/Input.php

diff --git a/system/core/Input.php b/system/core/Input.php
index dc7612e..cfbef94 100644
--- a/system/core/Input.php
+++ b/system/core/Input.php
@@ -672,7 +672,7 @@
 	 */
 	public function is_cli_request()
 	{
-		return (bool) defined('STDIN');
+		return (php_sapi_name() == 'cli') or defined('STDIN');
 	}
 
 }

system/core/URI.php

diff --git a/system/core/URI.php b/system/core/URI.php
index d565486..20f0f00 100644
--- a/system/core/URI.php
+++ b/system/core/URI.php
@@ -62,7 +62,7 @@
 		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;