Merge branch '1.4'

dbu · dbu · commit 97def24f8306 · 2017-05-09T10:14:24.000+02:00
diff --git a/src/Candidates/Candidates.php b/src/Candidates/Candidates.php
@@ -108,7 +108,7 @@ protected function determineLocale($url)
         }
 
         $matches = [];
-        if (preg_match('#('.implode('|', $this->locales).')(/|$)#', $url, $matches)) {
+        if (preg_match('#^/('.implode('|', $this->locales).')(/|$)#', $url, $matches)) {
             return $matches[1];
         }
 

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ protected function determineLocale($url)`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`$matches = [];`
`111`		`- if (preg_match('#('.implode('\|', $this->locales).')(/\|$)#', $url, $matches)) {`
	`111`	`+ if (preg_match('#^/('.implode('\|', $this->locales).')(/\|$)#', $url, $matches)) {`
`112`	`112`	`return $matches[1];`
`113`	`113`	`}`
`114`	`114`