Merge branch 'release/3.0.0-beta.10' into v3

nystudio107 · Mar 19, 2018 · febad0c · febad0c
2 parents 76b5512 + 98ee354
commit febad0c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # SEOmatic Changelog
 
+### 3.0.0-beta.10 - 2018.03.18
+## Changed
+* Reverted incorrect bundle merging
+
 ### 3.0.0-beta.9 - 2018.03.18
 ## Added
 * Added `Schema` helper class & controller in preparation for dynamic schema types displayed in the AdminCP

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
  "name": "nystudio107/craft-seomatic",
  "description": "SEOmatic facilitates modern SEO best practices & implementation for Craft CMS 3. It is a turnkey SEO system that is comprehensive, powerful, and flexible.",
  "type": "craft-plugin",
- "version": "3.0.0-beta.9",
+ "version": "3.0.0-beta.10",
  "keywords": [
  "craft",
  "cms",

diff --git a/src/services/MetaBundles.php b/src/services/MetaBundles.php
@@ -658,8 +658,8 @@ protected function createGlobalMetaBundleForSite(int $siteId, $baseConfig = []):
  );
  // Merge them together
  $metaBundle = MetaBundle::create(ArrayHelper::strictMerge(
- $metaBundleDefaults,
- $baseConfig
+ $baseConfig,
+ $metaBundleDefaults
  ));
  if ($metaBundle) {
  $this->updateMetaBundle($metaBundle, $siteId);
@@ -728,8 +728,8 @@ protected function createMetaBundleFromSection(Section $section, int $siteId, $b
  );
  // Merge them together
  $metaBundle = MetaBundle::create(ArrayHelper::strictMerge(
- $metaBundleDefaults,
- $baseConfig
+ $baseConfig,
+ $metaBundleDefaults
  ));
  if ($metaBundle) {
  $this->updateMetaBundle($metaBundle, $siteId);
@@ -799,8 +799,8 @@ protected function createMetaBundleFromCategory(CategoryGroup $category, int $si
  );
  // Merge them together
  $metaBundle = MetaBundle::create(ArrayHelper::strictMerge(
- $metaBundleDefaults,
- $baseConfig
+ $baseConfig,
+ $metaBundleDefaults
  ));
  if ($metaBundle) {
  $this->updateMetaBundle($metaBundle, $siteId);