Fixed #3922

craftcms · Feb 27, 2019 · cba5d60 · cba5d60
1 parent 97da9fa
commit cba5d60
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG-v3.md b/CHANGELOG-v3.md
@@ -11,6 +11,7 @@
 
 ### Fixed
 - Fixed a bug where Control Panel content areas weren’t getting their bottom padding applied in Firefox. ([#3874](https://github.com/craftcms/cms/issues/3874))
+- Fixed a PHP error that occurred on the front-end if two routes defined in Settings → Routes had the same URI pattern. ([#3922](https://github.com/craftcms/cms/issues/3922))
 
 ## 3.1.15 - 2019-02-26
 

diff --git a/src/services/Routes.php b/src/services/Routes.php
@@ -127,7 +127,10 @@ public function getProjectConfigRoutes(): array
         $sortOrders = [];
 
         foreach ($routes as $route) {
-            if (empty($route['site']) || $route['site'] == $currentSiteUid) {
+            if (
+                !isset($this->_projectConfigRoutes[$route['uriPattern']]) &&
+                (empty($route['site']) || $route['site'] == $currentSiteUid)
+            ) {
                 $this->_projectConfigRoutes[$route['uriPattern']] = ['template' => $route['template']];
                 $sortOrders[] = $route['sortOrder'];
             }