Commit 5ad4943e authored by Taylor Otwell's avatar Taylor Otwell

Fix slash handling in URL class.

parent ac7a77ff
...@@ -21,7 +21,7 @@ class URL { ...@@ -21,7 +21,7 @@ class URL {
// ---------------------------------------------------- // ----------------------------------------------------
// Get the base URL and index page. // 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? // Does the URL need an HTTPS protocol?
...@@ -31,7 +31,7 @@ class URL { ...@@ -31,7 +31,7 @@ class URL {
$base = 'https://'.substr($base, 7); $base = 'https://'.substr($base, 7);
} }
return $base.ltrim($url, '/'); return rtrim($base, '/').'/'.ltrim($url, '/');
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment