Fix slash handling in URL class.

5ad4943e · Taylor Otwell · ac7a77ff · 5ad4943e
Commit 5ad4943e authored Jun 16, 2011 by Taylor Otwell
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

url.php system/url.php +2 -2

No files found.
--- a/system/url.php
+++ b/system/url.php
@@ -21,7 +21,7 @@ class URL {
 		// ----------------------------------------------------
 		// Get the base URL and index page.
 		// ----------------------------------------------------
-		$base = Config::get('application.url').'/'.Config::get('application.index').'/';
+		$base = Config::get('application.url').'/'.Config::get('application.index');

 		// ----------------------------------------------------
 		// Does the URL need an HTTPS protocol?
@@ -31,7 +31,7 @@ class URL {
 			$base = 'https://'.substr($base, 7);
 		}

-		return $base.ltrim($url, '/');
+		return rtrim($base, '/').'/'.ltrim($url, '/');
 	}

 	/**