From 03acf9ca504deb0bab5ff8ca978cd45937304688 Mon Sep 17 00:00:00 2001 From: Aaron Kuzemchak Date: Sat, 15 Sep 2012 18:57:29 -0400 Subject: [PATCH 1/2] Fixes language URI routing issue Signed-off-by: Aaron Kuzemchak --- laravel/laravel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laravel/laravel.php b/laravel/laravel.php index 74c387f9..20ec8057 100644 --- a/laravel/laravel.php +++ b/laravel/laravel.php @@ -137,7 +137,7 @@ $languages[] = Config::get('application.language'); foreach ($languages as $language) { - if (starts_with($uri, $language)) + if (preg_match("#^{$language}(/.*)?$#i", $uri)) { Config::set('application.language', $language); From 581fcc5c47946882e560dd08c43a5005491fffe4 Mon Sep 17 00:00:00 2001 From: Aaron Kuzemchak Date: Sat, 15 Sep 2012 20:48:18 -0400 Subject: [PATCH 2/2] Cleaner regex Signed-off-by: Aaron Kuzemchak --- laravel/laravel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/laravel/laravel.php b/laravel/laravel.php index 20ec8057..3e382b89 100644 --- a/laravel/laravel.php +++ b/laravel/laravel.php @@ -137,7 +137,7 @@ $languages[] = Config::get('application.language'); foreach ($languages as $language) { - if (preg_match("#^{$language}(/.*)?$#i", $uri)) + if (preg_match("#^{$language}(?:$|/)#i", $uri)) { Config::set('application.language', $language);