From 1b019dffc549662c88df5abbd12a481b14ff5cae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Thu, 31 Oct 2013 15:28:19 +0100 Subject: [PATCH] // Fix lang detection on dispatcher --- classes/Dispatcher.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Dispatcher.php b/classes/Dispatcher.php index 7bfaa54ca..378dd1d8f 100644 --- a/classes/Dispatcher.php +++ b/classes/Dispatcher.php @@ -369,7 +369,7 @@ class DispatcherCore // If there are several languages, get language from uri if ($this->use_routes && Language::isMultiLanguageActivated()) - if (preg_match('#^/([a-z]{2})/?#', $this->request_uri, $m)) + if (preg_match('#^/([a-z]{2})(?:/.*)?$#', $this->request_uri, $m)) { $_GET['isolang'] = $m[1]; $this->request_uri = substr($this->request_uri, 3);