Changeset 3307221

Timestamp:

06/05/2025 06:58:00 PM (10 months ago)

Author:

looswebstudio

Message:

Update to version 1.8.2 from GitHub

Location:

useful-blocks

Files:

• tags/1.8.2 (copied) (copied from useful-blocks/trunk)
• tags/1.8.2/inc/register_blocks.php (modified) (1 diff)
• tags/1.8.2/readme.txt (modified) (2 diffs)
• tags/1.8.2/useful-blocks.php (modified) (1 diff)
• trunk/inc/register_blocks.php (modified) (1 diff)
• trunk/readme.txt (modified) (2 diffs)
• trunk/useful-blocks.php (modified) (1 diff)

useful-blocks/tags/1.8.2/inc/register_blocks.php

@@ -84 +84 @@
 
 /**
- * リストブロックで空のulタグを出力しない
+ * リストブロックで空のulタグを出力しない.かつ、「innerHTML」にコンテンツが含まれる古いリストブロックが空として扱われないように注意。
  */
 add_filter( 'render_block_ponhiro-blocks/list', function ( $block_content, $block ) {
-    $is_empty = true;
-    foreach ( $block['innerBlocks'] as $inner_block ) {
-        if ( ! empty( $inner_block['innerHTML'] ) ) {
-            $is_empty = false;
-            break;
+    $has_content = false;
+
+    // 新しい保存形式では、li要素が innerBlocks 配列に格納されている
+    if ( ! empty( $block['innerBlocks'] ) ) {
+        foreach ( $block['innerBlocks'] as $inner_block ) {
+            if ( ! empty( $inner_block['innerHTML'] ) ) {
+                $has_content = true;
+                break;
+            }
         }
+    // 古い保存形式では、innerBlocks が存在せず、HTML文字列がそのまま innerHTML に入る
+    } elseif ( ! empty( $block['innerHTML'] ) ) {
+        $has_content = '' !== trim( wp_strip_all_tags( $block['innerHTML'] ) );
     }
-    return $is_empty ? null : $block_content;
+
+    return $has_content ? $block_content : null;
 }, 10, 2 );

useful-blocks/tags/1.8.2/readme.txt

@@ -5 +5 @@
 Requires at least: 5.9
 Tested up to: 6.8
-Stable tag: 1.8.1
+Stable tag: 1.8.2
 Requires PHP: 7.0
 License: GPLv2 or later
@@ -35 +35 @@
 == Changelog ==
 
-= 1.8.0 =
+= 1.8.2 =
+- Fixed some bugs.
+
+= 1.8.1 =
 - Support for WordPress 6.7.
 - Fixed some bugs.

useful-blocks/tags/1.8.2/useful-blocks.php

@@ -4 +4 @@
  * Plugin URI: https://ponhiro.com/useful-blocks/
  * Description: It is a plugin that collects very convenient blocks.
- * Version: 1.8.1
+ * Version: 1.8.2
  * Requires at least: 5.9
  * Author: Ponhiro, Ryo

useful-blocks/trunk/inc/register_blocks.php

@@ -84 +84 @@
 
 /**
- * リストブロックで空のulタグを出力しない
+ * リストブロックで空のulタグを出力しない.かつ、「innerHTML」にコンテンツが含まれる古いリストブロックが空として扱われないように注意。
  */
 add_filter( 'render_block_ponhiro-blocks/list', function ( $block_content, $block ) {
-    $is_empty = true;
-    foreach ( $block['innerBlocks'] as $inner_block ) {
-        if ( ! empty( $inner_block['innerHTML'] ) ) {
-            $is_empty = false;
-            break;
+    $has_content = false;
+
+    // 新しい保存形式では、li要素が innerBlocks 配列に格納されている
+    if ( ! empty( $block['innerBlocks'] ) ) {
+        foreach ( $block['innerBlocks'] as $inner_block ) {
+            if ( ! empty( $inner_block['innerHTML'] ) ) {
+                $has_content = true;
+                break;
+            }
         }
+    // 古い保存形式では、innerBlocks が存在せず、HTML文字列がそのまま innerHTML に入る
+    } elseif ( ! empty( $block['innerHTML'] ) ) {
+        $has_content = '' !== trim( wp_strip_all_tags( $block['innerHTML'] ) );
     }
-    return $is_empty ? null : $block_content;
+
+    return $has_content ? $block_content : null;
 }, 10, 2 );

useful-blocks/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 5.9
 Tested up to: 6.8
-Stable tag: 1.8.1
+Stable tag: 1.8.2
 Requires PHP: 7.0
 License: GPLv2 or later
@@ -35 +35 @@
 == Changelog ==
 
-= 1.8.0 =
+= 1.8.2 =
+- Fixed some bugs.
+
+= 1.8.1 =
 - Support for WordPress 6.7.
 - Fixed some bugs.

useful-blocks/trunk/useful-blocks.php

@@ -4 +4 @@
  * Plugin URI: https://ponhiro.com/useful-blocks/
  * Description: It is a plugin that collects very convenient blocks.
- * Version: 1.8.1
+ * Version: 1.8.2
  * Requires at least: 5.9
  * Author: Ponhiro, Ryo