ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing a double slash bug in URL generation with languages. add tests.

Browse Source
This commit is contained in:
Taylor Otwell
2012-09-01 22:07:01 -05:00
parent cfe5fa109a
commit 4e21cfce39
3 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
laravel/url.php
View File

@@ -114,9 +114,14 @@ class URL {
$root .= '/'.Config::get('application.index');
}
if ( ! $asset and $locale and count(Config::get('application.languages')) > 0)
$languages = Config::get('application.languages');
if ( ! $asset and $locale and count($languages) > 0)
{
$root .= '/'.Config::get('application.language');
if (in_array($default = Config::get('application.language'), $languages))
{
$root = rtrim($root, '/').'/'.$default;
}
}
// Since SSL is not often used while developing the application, we allow the