fixes another case where locale resolver does not produce a result

wodor · Apr 22, 2012 · 6578eea · 6578eea
1 parent f063a55
commit 6578eea
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/Router/I18nRouter.php b/Router/I18nRouter.php
@@ -164,6 +164,12 @@ public function match($url)
                     && $this->container->isScopeActive('request')) {
                 $currentLocale = $this->localeResolver->resolveLocale(
                     $this->container->get('request'), $params['_locales']);
+
+                // If the locale resolver was not able to determine a locale, then all efforts to
+                // make an informed decision have failed. Just display something as a last resort.
+                if (!$currentLocale) {
+                    $currentLocale = reset($params['_locales']);
+                }
             }
 
             if (!in_array($currentLocale, $params['_locales'], true)) {