Skip to content

S
syncEnrollments
Commit 8871ddff authored by Taylor Otwell's avatar Taylor Otwell
Browse files
Options

Fixed bug in URL::to method.

parent 3c8da4df
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 2 deletions
system/url.php
View file @ 8871ddff
......@@ -21,9 +21,15 @@ class URL {
$base = Config::get('application.url').'/'.Config::get('application.index');
$base = ($asset) ? str_replace('/'.Config::get('application.index'), '', $base) : $base;
if ($asset and Config::get('application.index') !== '')
{
$base = str_replace('/'.Config::get('application.index'), '', $base);
}
$base = ($https and strpos($base, 'http://') === 0) ? 'https://'.substr($base, 7) : $base;
if ($https and strpos($base, 'http://') === 0)
{
$base = 'https://'.substr($base, 7);
}
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