From 37f4b9caa02783e06dd7c5318200113409a0deb1 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Fri, 1 Jul 2011 17:56:50 -0500
Subject: backed out 648b42a75739, which was a NON-trivial whitespace commit. 
 It broke the Typography class's string replacements, for instance

---
 system/core/URI.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'system/core/URI.php')

diff --git a/system/core/URI.php b/system/core/URI.php
index 94fac59ac..d56548654 100644
--- a/system/core/URI.php
+++ b/system/core/URI.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 /**
  * CodeIgniter
  *
@@ -36,7 +36,7 @@ class CI_URI {
 	/**
 	 * Constructor
 	 *
-	 * Simply globalizes the $RTR object. The front
+	 * Simply globalizes the $RTR object.  The front
 	 * loads the Router class early on so it's not available
 	 * normally as other classes are.
 	 *
@@ -85,7 +85,7 @@ class CI_URI {
 			}
 
 			// No PATH_INFO?... What about QUERY_STRING?
-			$path = (isset($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : @getenv('QUERY_STRING');
+			$path =  (isset($_SERVER['QUERY_STRING'])) ? $_SERVER['QUERY_STRING'] : @getenv('QUERY_STRING');
 			if (trim($path, '/') != '')
 			{
 				$this->_set_uri_string($path);
@@ -251,7 +251,7 @@ class CI_URI {
 	 */
 	function _remove_url_suffix()
 	{
-		if ($this->config->item('url_suffix') != "")
+		if  ($this->config->item('url_suffix') != "")
 		{
 			$this->uri_string = preg_replace("|".preg_quote($this->config->item('url_suffix'))."$|", "", $this->uri_string);
 		}
@@ -285,7 +285,7 @@ class CI_URI {
 	 * Re-index Segments
 	 *
 	 * This function re-indexes the $this->segment array so that it
-	 * starts at 1 rather than 0. Doing so makes it simpler to
+	 * starts at 1 rather than 0.  Doing so makes it simpler to
 	 * use functions like $this->uri->segment(n) since there is
 	 * a 1:1 relationship between the segment array and the actual segments.
 	 *
@@ -323,7 +323,7 @@ class CI_URI {
 	 * Fetch a URI "routed" Segment
 	 *
 	 * This function returns the re-routed URI segment (assuming routing rules are used)
-	 * based on the number provided. If there is no routing this function returns the
+	 * based on the number provided.  If there is no routing this function returns the
 	 * same result as $this->segment()
 	 *
 	 * @access	public
@@ -425,7 +425,7 @@ class CI_URI {
 
 		$i = 0;
 		$lastval = '';
-		$retval = array();
+		$retval  = array();
 		foreach ($segments as $seg)
 		{
 			if ($i % 2)
-- 
cgit v1.2.3-24-g4f1b


From c5dccf70ef6d8420b0b858f36318fc4375b0e25d Mon Sep 17 00:00:00 2001
From: Phil Sturgeon <email@philsturgeon.co.uk>
Date: Sat, 13 Aug 2011 11:06:57 -0600
Subject: Get php_sapi_name() == 'cli' involved in the 'is this the command
 line?' decision.

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

(limited to 'system/core/URI.php')

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 07b53422f8d61e6b0b7e6479b0de92ad1a1ce05e Mon Sep 17 00:00:00 2001
From: David Behler <mail@davidbehler.de>
Date: Mon, 15 Aug 2011 00:25:06 +0200
Subject: Added some docs to CI core files

---
 system/core/URI.php | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 mode change 100644 => 100755 system/core/URI.php

(limited to 'system/core/URI.php')

diff --git a/system/core/URI.php b/system/core/URI.php
old mode 100644
new mode 100755
index d56548654..10b0b7fa3
--- a/system/core/URI.php
+++ b/system/core/URI.php
@@ -28,9 +28,34 @@
  */
 class CI_URI {
 
+	/**
+	 * List of cached uri segments
+	 *
+	 * @var array
+	 * @access public
+	 */
 	var	$keyval			= array();
+	/**
+	 * Current uri string
+	 *
+	 * @var string
+	 * @access public
+	 */
 	var $uri_string;
+	/**
+	 * List of uri segments
+	 *
+	 * @var array
+	 * @access public
+	 */
 	var $segments		= array();
+	/**
+	 * Re-indexed list of uri segments
+	 * Starts at 1 instead of 0
+	 *
+	 * @var array
+	 * @access public
+	 */
 	var $rsegments		= array();
 
 	/**
@@ -127,6 +152,7 @@ class CI_URI {
 	 * Set the URI String
 	 *
 	 * @access	public
+	 * @param 	string
 	 * @return	string
 	 */
 	function _set_uri_string($str)
@@ -366,6 +392,11 @@ class CI_URI {
 	/**
 	 * Identical to above only it uses the re-routed segment array
 	 *
+	 * @access 	public
+	 * @param 	integer	the starting segment number
+	 * @param 	array	an array of default values
+	 * @return 	array
+	 *
 	 */
 	function ruri_to_assoc($n = 3, $default = array())
 	{
-- 
cgit v1.2.3-24-g4f1b