Skip to content

S
syncEnrollments
Commit 4b7dc2e8 authored by Taylor Otwell's avatar Taylor Otwell
Browse files
Options

Merge pull request #1226 from akuzemchak/bug/language-routes 

Fixes language URI routing issue
parents 9acf5416 581fcc5c
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
laravel/laravel.php
View file @ 4b7dc2e8
...@@ -137,7 +137,7 @@ $languages[] = Config::get('application.language'); ...@@ -137,7 +137,7 @@ $languages[] = Config::get('application.language');
foreach ($languages as $language) foreach ($languages as $language)
{ {
if (starts_with($uri, $language)) if (preg_match("#^{$language}(?:$|/)#i", $uri))
{ {
Config::set('application.language', $language); Config::set('application.language', $language);
......
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