summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Http/HttpUtils.php6
1 files changed, 1 insertions, 5 deletions
diff --git a/Http/HttpUtils.php b/Http/HttpUtils.php
index a26b1bd..c11b283 100644
--- a/Http/HttpUtils.php
+++ b/Http/HttpUtils.php
@@ -127,11 +127,7 @@ class HttpUtils
try {
$parameters = $this->router->match($request->getPathInfo());
- if (isset($parameters['_locale'])) {
- $context->setParameter('_locale', $parameters['_locale']);
- } elseif ($session = $request->getSession()) {
- $context->setParameter('_locale', $session->getLocale());
- }
+ $context->setParameter('_locale', isset($parameters['_locale']) ? $parameters['_locale'] : $request->getLocale());
} catch (\Exception $e) {
// let's hope user doesn't use the locale in the path
}