From e0df07950b101316c07ccec882ae00f930bca0c6 Mon Sep 17 00:00:00 2001
From: Phil Sturgeon <email@philsturgeon.co.uk>
Date: Fri, 22 Jul 2011 16:11:34 -0600
Subject: Fixed conflict in changelog.

---
 system/core/Loader.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'system/core')

diff --git a/system/core/Loader.php b/system/core/Loader.php
index 721c196cc..7c8b298ac 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -388,6 +388,21 @@ class CI_Loader {
 
 	// --------------------------------------------------------------------
 
+	/**
+	 * Get Variable
+	 *
+	 * Check if a variable is set and retrieve it.
+	 *
+	 * @param	array
+	 * @return	void
+	 */
+	public function get_var($key)
+	{
+		return isset($this->_ci_cached_vars[$key]) ? $this->_ci_cached_vars[$key] : NULL;
+	}
+
+	// --------------------------------------------------------------------
+
 	/**
 	 * Load Helper
 	 *
-- 
cgit v1.2.3-24-g4f1b


From fe1d45a023b08753f4c5f1d908d54ae842277558 Mon Sep 17 00:00:00 2001
From: Phil Sturgeon <email@philsturgeon.co.uk>
Date: Sat, 13 Aug 2011 11:06:57 -0600
Subject: Fixed conflicts.

---
 system/core/Input.php | 2 +-
 system/core/URI.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'system/core')

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;
-- 
cgit v1.2.3-24-g4f1b


From 4c76272593d82f45761c24917e69b42983f26171 Mon Sep 17 00:00:00 2001
From: Phil Sturgeon <email@philsturgeon.co.uk>
Date: Sat, 13 Aug 2011 11:31:22 -0600
Subject: Bumped the version number. Can somebody with a working find and
 replace fix up the docs?

---
 system/core/CodeIgniter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/core')

diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index 03b25ab9e..94fecb5c0 100644
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -32,7 +32,7 @@
  *  Define the CodeIgniter Version
  * ------------------------------------------------------
  */
-	define('CI_VERSION', '2.0.2');
+	define('CI_VERSION', '2.0.3');
 
 /*
  * ------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b