Merge pull request #211 from vektor-inc/fix/blockType-error

[ Bug fix ] Fixed errors that occur on the site editor.

patterns-data/class-register-patterns-from-json.php

@@ -2,7 +2,8 @@
 /**
  * 生成先のテーマ・プラグインでブロックパターン情報を読み込んで登録
  *
- * @package VK Block Pattern Plugin Generator
+ * @package vektor-inc/vk-block-pattern-plugin-generator
+ * @version 0.8.8
  */
 
 namespace wp_content\plugins\vk_block_patterns\patterns_data;
@@ -28,7 +29,7 @@ public function __construct() {
 	 * @return string 最小化したCSSファイル
 	 */
 	public static function load_inline_css( $filename = 'style.css' ) {
-		$style_path  = wp_normalize_path( dirname( __FILE__ ) . '/' . $filename );
+		$style_path  = wp_normalize_path( __DIR__ . '/' . $filename );
 		$style_url   = str_replace( wp_normalize_path( ABSPATH ), site_url() . '/', $style_path );
 		$dynamic_css = '';
 		if ( file_exists( $style_path ) ) {
@@ -77,7 +78,7 @@ public static function print_pattern_editor_css() {
 	public static function register_template() {
 
 		// これは読み込み側では存在しないクラスなので要対応.
-		$json_dir_path = wp_normalize_path( dirname( __FILE__ ) . '/' );
+		$json_dir_path = wp_normalize_path( __DIR__ . '/' );
 
 		if ( function_exists( 'register_block_pattern_category' ) && function_exists( 'register_block_pattern' ) ) {
 
@@ -168,29 +169,35 @@ public static function register_template() {
 						if ( in_array( $site_lang, (array) $val['languages'], true ) ) {
 							// 本来 $val['post_status'] は必ず必ず入ってくる。リリース前のデータ対応なので2021年3月以降削除可.
 							if ( ! isset( $val['post_status'] ) || 'publish' === $val['post_status'] ) {
+								$pattern_properties = array(
+									'title'      => $val['title'],
+									'categories' => $val['categories'],
+									'content'    => $val['content'],
+								);
+								if ( ! empty( $val['blockTypes'] ) ) {
+									$pattern_properties['blockTypes'] = $val['blockTypes'];
+								}
 								register_block_pattern(
 									$val['post_name'],
-									array(
-										'title'      => $val['title'],
-										'categories' => $val['categories'],
-										'content'    => $val['content'],
-										'blockTypes' => $val['blockTypes'],
-									)
+									$pattern_properties
 								);
 							}
 						}
 					} else {
 						// 英語のパターンのみ登録するモード.
 						if ( in_array( mb_strtolower( 'en_US' ), (array) $val['languages'], true ) ) {
 							if ( ! isset( $val['post_status'] ) || 'publish' === $val['post_status'] ) {
+								$pattern_properties = array(
+									'title'      => $val['title'],
+									'categories' => $val['categories'],
+									'content'    => $val['content'],
+								);
+								if ( ! empty( $val['blockTypes'] ) ) {
+									$pattern_properties['blockTypes'] = $val['blockTypes'];
+								}
 								register_block_pattern(
 									$val['post_name'],
-									array(
-										'title'      => $val['title'],
-										'categories' => $val['categories'],
-										'content'    => $val['content'],
-										'blockTypes' => $val['blockTypes'],
-									)
+									$pattern_properties
 								);
 							}
 						}

readme.txt

@@ -2,10 +2,10 @@
 Contributors: vektor-inc,kurudrive,rickaddison7634,kaorock72,una9,shimotomoki,doshimaf
 Donate link:
 Tags: Guternberg, Block Pattern
-Requires at least: 6.0
-Tested up to: 6.2
-Stable tag: 1.32.1.0
-Requires PHP: 7.2
+Requires at least: 6.2
+Tested up to: 6.6
+Stable tag: 1.32.2.0
+Requires PHP: 7.4
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
 
@@ -16,8 +16,11 @@ When you activate this plugin that create new custom post type for custom block
 
 == Changelog ==
 
+= 1.32.2 =
+[ Bug fix ] Fixed errors that occur on the site editor.
+
 = 1.32.1 =
-[ Bug fix ]　The auto insert supports the post type created by Custom Post Type UI.
+[ Bug fix ] The auto insert supports the post type created by Custom Post Type UI.
 
 = 1.32.0 =
 [ Update ] Adjust all patterns

vk-block-patterns.php

@@ -3,8 +3,8 @@
  * Plugin Name: VK Block Patterns
  * Plugin URI: https://github.com/vektor-inc/vk-block-patterns
  * Description: You can make and register your original custom block patterns.
- * Version: 1.32.1.0
- * Requires at least: 6.0
+ * Version: 1.32.2.0
+ * Requires at least: 6.2
  * Author:  Vektor,Inc.
  * Author URI: https://vektor-inc.co.jp
  * Text Domain: vk-block-patterns