Automated merge with http://hg.ellislab.com/CodeIgniter-Reactor

Phil Sturgeon · Phil Sturgeon · commit 87a5cf3ee39c · 2011-01-13T13:04:36.000Z
diff --git a/application/config/config.php b/application/config/config.php
@@ -188,7 +188,7 @@
 |--------------------------------------------------------------------------
 |
 | Leave this BLANK unless you would like to set something other than the default
-| system/logs/ folder.  Use a full server path with trailing slash.
+| application/logs/ folder. Use a full server path with trailing slash.
 |
 */
 $config['log_path'] = '';
diff --git a/system/core/URI.php b/system/core/URI.php
@@ -642,7 +642,7 @@ function uri_string()
 	 */
 	function ruri_string()
 	{
-		return '/'.implode('/', $this->rsegment_array()).'/';
+		return '/'.implode('/', $this->rsegment_array());
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@`
`188`	`188`	`\|--------------------------------------------------------------------------`
`189`	`189`	`\|`
`190`	`190`	`\| Leave this BLANK unless you would like to set something other than the default`
`191`		`-\| system/logs/ folder. Use a full server path with trailing slash.`
	`191`	`+\| application/logs/ folder. Use a full server path with trailing slash.`
`192`	`192`	`\|`
`193`	`193`	`*/`
`194`	`194`	`$config['log_path'] = '';`
Original file line number	Diff line number	Diff line change
`@@ -642,7 +642,7 @@ function uri_string()`
`642`	`642`	`*/`
`643`	`643`	`function ruri_string()`
`644`	`644`	`{`
`645`		`- return '/'.implode('/', $this->rsegment_array()).'/';`
	`645`	`+ return '/'.implode('/', $this->rsegment_array());`
`646`	`646`	`}`
`647`	`647`
`648`	`648`	`}`