craft 4 - fix #2

matfish2 · Jul 6, 2022 · 2517844 · 2517844
1 parent 67c657b
commit 2517844
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release Notes for Blogify
 
+## 2.0.2 - 2022-07-06
+### Fixed
+- Multisite Support [#2](https://github.com/matfish2/craft-blogify/issues/2)
+
 ## 2.0.1 - 2022-06-13
 ### Fixed
 - Allow Redactor version >=3

diff --git a/src/migrations/Migrators/BlogCategoriesMigrator.php b/src/migrations/Migrators/BlogCategoriesMigrator.php
@@ -22,22 +22,24 @@ public static function add(): bool
             return true;
         }
 
-        $siteId = Craft::$app->sites->getPrimarySite()->id;
-
-        $siteSettings = new CategoryGroup_SiteSettings([
-            'siteId' => Craft::$app->sites->getPrimarySite()->id,
-            'hasUrls' => true,
-            'uriFormat' => 'blog/category/{slug}',
-            'template' => 'blogify/filters/category/_entry',
-        ]);
+        $allSitesSettings = [];
+
+        foreach (Craft::$app->getSites()->getAllSiteIds() as $siteId) {
+            $allSitesSettings[$siteId] = new CategoryGroup_SiteSettings([
+                'siteId' => $siteId,
+                'hasUrls' => true,
+                'uriFormat' => 'blog/category/{slug}',
+                'template' => 'blogify/filters/category/_entry',
+            ]);
+        }
 
         $categoryGroup = new CategoryGroup([
                 'name' => 'Blog Categories',
                 'handle' => Handles::CATEGORIES,
             ]
         );
 
-        $categoryGroup->setSiteSettings([$siteId => $siteSettings]);
+        $categoryGroup->setSiteSettings($allSitesSettings);
 
         return Craft::$app->categories->saveGroup($categoryGroup);
     }

diff --git a/src/services/SectionService.php b/src/services/SectionService.php
@@ -20,19 +20,23 @@ public function add($name, $handle, $type, $url, $template): bool
             return true;
         }
 
+        $allSitesSettings = [];
+
+        foreach (Craft::$app->getSites()->getAllSiteIds() as $siteId) {
+            $allSitesSettings[$siteId] = new Section_SiteSettings([
+                'siteId' => $siteId,
+                'enabledByDefault' => true,
+                'hasUrls' => true,
+                'uriFormat' => 'blog' . $url,
+                'template' => 'blogify/' . $template,
+            ]);
+        }
+
         $section = new Section([
             'name' => $name,
             'handle' => $handle,
             'type' => $type,
-            'siteSettings' => [
-                new Section_SiteSettings([
-                    'siteId' => Craft::$app->sites->getPrimarySite()->id,
-                    'enabledByDefault' => true,
-                    'hasUrls' => true,
-                    'uriFormat' => 'blog' . $url,
-                    'template' => 'blogify/' . $template,
-                ]),
-            ]
+            'siteSettings' => $allSitesSettings
         ]);
 
         if (!Craft::$app->sections->saveSection($section)) {