Error in resolving site rules

ryssbowh · Jun 8, 2021 · 6455b9c · 6455b9c
1 parent 68f8b35
commit 6455b9c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # ryssbowh/craft-themes Changelog
 
+## 2.1.2 - 2021-06-08
+
+### Fixed
+- Error in resolving site rules
+
 ## 2.1.1 - 2021-05-10
 
 ### Fixed

diff --git a/src/services/ThemesRules.php b/src/services/ThemesRules.php
@@ -88,16 +88,16 @@ public static function clearCaches()
      * 
      * @return ?string
      */
-    protected function resolveRules(string $path, Site $site, string $url): ?string
+    protected function resolveRules(string $path, Site $currentSite, string $url): ?string
     {
         $themeName = null;
         foreach ($this->rules as $rule) {
             if (!$rule['enabled']) {
                 continue;
             }
             $site = $language = $url = false;
-            if ($site = $this->resolveSiteRule($rule['site'], $site)) {
-                if ($language = $this->resolveLanguageRule($rule['language'], $site->getLocale())) {
+            if ($site = $this->resolveSiteRule($rule['site'], $currentSite)) {
+                if ($language = $this->resolveLanguageRule($rule['language'], $currentSite->getLocale())) {
                     $url = $this->resolvePathRule($rule['url'], $path);
                 }
             }