Merge branch 'release/1.12.0'

CHANGES.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.12.0 (6/25/21)
+* Changed: Update CMB2 to 2.9.0
+* Changed: Update updater.
+* Fixed: Duplicate function error in WooCommerce if another plugin calls a template a second time.
+
 ## 1.11.9 (2/13/21)
 * Changed: Update CMB2 to 2.8.0.
 

lib/structure/woocommerce.php

@@ -274,9 +274,9 @@ function mai_woo_before_related( $template_name, $template_path, $located, $args
 		return;
 	}
 	add_filter( 'mai_get_columns', 'mai_woo_related_columns' );
-	function mai_woo_related_columns( $columns ) {
-		return 3;
-	}
+}
+function mai_woo_related_columns( $columns ) {
+	return 3;
 }
 
 /**
@@ -309,9 +309,9 @@ function mai_woo_before_crosssells( $template_name, $template_path, $located, $a
 		return;
 	}
 	add_filter( 'mai_get_columns', 'mai_woo_crosssells_columns' );
-	function mai_woo_crosssells_columns( $columns ) {
-		return 2;
-	}
+}
+function mai_woo_crosssells_columns( $columns ) {
+	return 2;
 }
 
 /**

mai-theme-engine.php

@@ -5,7 +5,7 @@
  * Plugin URI:      https://maitheme.com/
  * Description:     The Mai Theme Engine plugin
  *
- * Version:         1.11.9
+ * Version:         1.12.0
  *
  * GitHub URI:      maithemewp/mai-theme-engine
  *
@@ -89,7 +89,7 @@ public function __wakeup() {
 	private function setup_constants() {
 
 		// Plugin version.
-		define( 'MAI_THEME_ENGINE_VERSION', '1.11.9' );
+		define( 'MAI_THEME_ENGINE_VERSION', '1.12.0' );
 
 		// DB version.
 		define( 'MAI_THEME_ENGINE_DB_VERSION', '1600' );

vendor/cmb2/cmb2/CHANGELOG.md

@@ -2,9 +2,21 @@
 All notable changes to this project will be documented in this file.
 
 ## Unreleased
-* 
 
-## [2.8.0 - 2020-01-21](https://github.com/CMB2/CMB2/releases/tag/v2.7.0)
+## [2.9.0 - 2020-03-21](https://github.com/CMB2/CMB2/releases/tag/v2.9.0)
+
+### Enhancements
+* Added `cmb2_tab_group_tabs` filter for adding arbitrary menu page urls to the cmb2 tabs, and move tab markup output to separate method, `CMB2_Options_Hookup::options_page_tab_nav_output()`. Fixes [#1407](https://github.com/CMB2/CMB2/issues/1407).
+* Limit use of italic, including removing from field descriptions. Fixes [#1404](https://github.com/CMB2/CMB2/issues/1404).
+* Add to list of valid image types from `get_allowed_mime_types()`, which makes SVGs more reliable when using the [Safe SVG](https://wordpress.org/plugins/safe-svg/) plugin. Fixes [#1223](https://github.com/CMB2/CMB2/issues/1223).
+
+### Bug Fixes
+* Fixes PHP warnings on repeatable ColorPicker with an array as default. Props [@rubengc](https://github.com/rubengc) ([#1340](https://github.com/CMB2/CMB2/pull/1340)).
+* Address PHP 7.4, compatibility issues with `func_get_args()`. Fixes [#1389](https://github.com/CMB2/CMB2/issues/1389).
+* Better generated array key for cached fields, fixes issue where wrong field is found. Fixes [#14053](https://github.com/CMB2/CMB2/issues/14053).
+* Fix issue with options-pages being changed to register on a hook priority of `5` instead of the default `10`, causing some back-compatibility issues. Fixes [#1410](https://github.com/CMB2/CMB2/issues/1410).
+
+## [2.8.0 - 2020-01-21](https://github.com/CMB2/CMB2/releases/tag/v2.8.0)
 
 ### Enhancements
 * Added [CODE_OF_CONDUCT.md](https://github.com/CMB2/CMB2/blob/develop/CODE_OF_CONDUCT.md) file to meet GitHub Community standards. Props [@RubenMartins](https://github.com/RubenMartins) ([#1331](https://github.com/CMB2/CMB2/pull/1331)).

vendor/cmb2/cmb2/composer.json

@@ -1,46 +1,53 @@
 {
-    "name": "cmb2/cmb2",
-    "description": "CMB2 is a metabox, custom fields, and forms library for WordPress that will blow your mind.",
-    "license": "GPL-2.0-or-later",
-    "authors": [
-        {
-            "name": "Justin Sternberg",
-            "email": "[email protected]",
-            "homepage": "https://dsgnwrks.pro",
-            "role": "Developer"
-        },
-        {
-            "name": "WebDevStudios",
-            "email": "[email protected]",
-            "homepage": "https://github.com/WebDevStudios",
-            "role": "Developer"
-        }
-    ],
-    "keywords": ["wordpress", "plugin", "metabox"],
-    "homepage": "https://github.com/CMB2/CMB2",
-    "type": "wordpress-plugin",
-    "support": {
-        "issues": "https://github.com/CMB2/CMB2/issues",
-        "source": "http://wordpress.org/support/plugin/cmb2"
-    },
-    "require": {
-        "php": ">5.2.4"
-    },
-    "suggest": {
-        "composer/installers": "~1.0"
-    },
-    "require-dev": {
-        "apigen/apigen": "4.1.2",
-        "nette/utils": "2.5.3",
-        "phpunit/phpunit": "6.5.13"
-    },
-    "scripts": {
-      "test": [
-        "vendor/bin/phpunit"
-      ],
-      "docs": [
-        "vendor/bin/apigen generate --config apigen/apigen.neon",
-        "php apigen/hook-docs.php"
-      ]
-    }
+	"name": "cmb2/cmb2",
+	"description": "CMB2 is a metabox, custom fields, and forms library for WordPress that will blow your mind.",
+	"license": "GPL-2.0-or-later",
+	"authors": [
+		{
+			"name": "Justin Sternberg",
+			"email": "[email protected]",
+			"homepage": "https://dsgnwrks.pro",
+			"role": "Developer"
+		},
+		{
+			"name": "WebDevStudios",
+			"email": "[email protected]",
+			"homepage": "https://github.com/WebDevStudios",
+			"role": "Developer"
+		}
+	],
+	"keywords": ["wordpress", "plugin", "metabox"],
+	"homepage": "https://github.com/CMB2/CMB2",
+	"type": "wordpress-plugin",
+	"support": {
+		"issues": "https://github.com/CMB2/CMB2/issues",
+		"source": "http://wordpress.org/support/plugin/cmb2"
+	},
+	"require": {
+		"php": ">5.2.4"
+	},
+	"suggest": {
+		"composer/installers": "~1.0"
+	},
+	"require-dev": {
+		"apigen/apigen": "4.1.2",
+		"nette/utils": "2.5.3",
+		"phpunit/phpunit": "6.5.13",
+		"awesomemotive/am-cli-tools": ">=1.3.1"
+	},
+	"repositories": [
+		{
+			"type": "vcs",
+			"url": "https://github.com/awesomemotive/am-cli-tools"
+		}
+	],
+	"scripts": {
+	  "test": [
+		"vendor/bin/phpunit"
+	  ],
+	  "docs": [
+		"vendor/bin/apigen generate --config apigen/apigen.neon",
+		"php apigen/hook-docs.php"
+	  ]
+	}
 }