Merge branch 'release/4.0.0-beta.2' into v4

nystudio107 · Apr 13, 2022 · 13e0b76 · 13e0b76
2 parents 3b354f7 + 91c9bcf
commit 13e0b76
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Route Map Changelog
 
+## 4.0.0-beta.2 - 2022.04.13
+### Fixed
+* Fixed an issue that would cause `craft.routeMap.getAllRouteRules()` to throw an exception ([#30](https://github.com/nystudio107/craft-routemap/issues/30))
+
 ## 4.0.0-beta.1 - 2022.03.14
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "nystudio107/craft-routemap",
   "description": "Returns a list of Craft/Vue/React route rules and element URLs for ServiceWorkers from Craft entries",
   "type": "craft-plugin",
-  "version": "4.0.0-beta.1",
+  "version": "4.0.0-beta.2",
   "keywords": [
     "craft",
     "cms",

diff --git a/src/services/Routes.php b/src/services/Routes.php
@@ -504,7 +504,7 @@ public function invalidateCache(): void
      */
     public function getRouteRules(?int $siteId = null, bool $includeGlobal = true): array
     {
-        $globalRules = $includeGlobal === true ? $this->getDbRoutes('global') : [];
+        $globalRules = [];
 
         $siteRoutes = $this->getDbRoutes($siteId);