Changeset 2406757

Timestamp:

10/26/2020 01:03:38 PM (5 years ago)

Author:

nosolosw

Message:

Commiting Gutenberg version 9.2.2

Location:

gutenberg/trunk

Files:

• changelog.txt (modified) (1 diff)
• gutenberg.php (modified) (2 diffs)
• lib/class-wp-block-supports.php (modified) (4 diffs)
• lib/class-wp-block.php (modified) (2 diffs)
• lib/compat.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)

gutenberg/trunk/changelog.txt

@@ -1 +1 @@
 == Changelog ==
+
+= 9.2.2 =
+
+### Bug Fixes
+
+- Fix widget previews in the widget screen [26356](https://github.com/WordPress/gutenberg/pull/26356) [26417](https://github.com/WordPress/gutenberg/pull/26417)
 
 = 9.2.1 =

gutenberg/trunk/gutenberg.php

@@ -6 +6 @@
  * Requires at least: 5.3
  * Requires PHP: 5.6
- * Version: 9.2.1
+ * Version: 9.2.2
  * Author: Gutenberg Team
  * Text Domain: gutenberg
@@ -14 +14 @@
 
 ### BEGIN AUTO-GENERATED DEFINES
-define( 'GUTENBERG_VERSION', '9.2.1' );
-define( 'GUTENBERG_GIT_COMMIT', 'f798da665b21fd76606fd46c7cc08432bcde007e' );
+define( 'GUTENBERG_VERSION', '9.2.2' );
+define( 'GUTENBERG_GIT_COMMIT', '28b1593597ced9fd9dfb3450ad8dca9f087ab198' );
 ### END AUTO-GENERATED DEFINES
 

gutenberg/trunk/lib/class-wp-block-supports.php

@@ -19 +19 @@
      */
     private $block_supports = array();
+
+    /**
+     * Tracks the current block to be rendered.
+     *
+     * @var array
+     */
+    public static $block_to_render = null;
 
     /**
@@ -68 +75 @@
      * the given block all of the features that the block supports.
      *
-     * @param  array $parsed_block Block as parsed from content.
      * @return array               Array of HTML attributes.
      */
-    public function apply_block_supports( $parsed_block ) {
-        $block_attributes = $parsed_block['attrs'];
+    public function apply_block_supports() {
+        $block_attributes = self::$block_to_render['attrs'];
         $block_type       = WP_Block_Type_Registry::get_instance()->get_registered(
-            $parsed_block['blockName']
+            self::$block_to_render['blockName']
         );
 
@@ -145 +151 @@
  */
 function get_block_wrapper_attributes( $extra_attributes = array() ) {
-    global $current_parsed_block;
-    $new_attributes = WP_Block_Supports::get_instance()->apply_block_supports( $current_parsed_block );
+    $new_attributes = WP_Block_Supports::get_instance()->apply_block_supports();
 
     if ( empty( $new_attributes ) && empty( $extra_attributes ) ) {
@@ -192 +197 @@
 }
 
+/**
+ * Callback hooked to the register_block_type_args filter.
+ *
+ * This hooks into block registration to wrap the render_callback
+ * of dynamic blocks with a closure that keeps track of the
+ * current block to be rendered.
+ *
+ * @param array $args Block attributes.
+ * @return array Block attributes.
+ */
+function wp_block_supports_track_block_to_render( $args ) {
+    if ( is_callable( $args['render_callback'] ) ) {
+        $block_render_callback   = $args['render_callback'];
+        $args['render_callback'] = function( $attributes, $content, $block = null ) use ( $block_render_callback ) {
+            // Check for null for back compatibility with WP_Block_Type->render
+            // which is unused since the introduction of WP_Block class.
+            //
+            // See:
+            // - https://core.trac.wordpress.org/ticket/49927
+            // - commit 910de8f6890c87f93359c6f2edc6c27b9a3f3292 at wordpress-develop.
+
+            if ( null === $block ) {
+                return $block_render_callback( $attributes, $content );
+            }
+
+            $parent_block                       = WP_Block_Supports::$block_to_render;
+            WP_Block_Supports::$block_to_render = $block->parsed_block;
+            $result                             = $block_render_callback( $attributes, $content, $block );
+            WP_Block_Supports::$block_to_render = $parent_block;
+            return $result;
+        };
+    }
+    return $args;
+}
+
 add_action( 'init', array( 'WP_Block_Supports', 'init' ), 22 );
+add_filter( 'register_block_type_args', 'wp_block_supports_track_block_to_render' );

gutenberg/trunk/lib/class-wp-block.php

@@ -204 +204 @@
     public function render( $options = array() ) {
         global $post;
-        global $current_parsed_block;
         $options = array_replace(
             array(
@@ -218 +217 @@
             $index = 0;
             foreach ( $this->inner_content as $chunk ) {
-                if ( is_string( $chunk ) ) {
-                    $block_content .= $chunk;
-                } else {
-                    $parent_parsed_block  = $current_parsed_block;
-                    $current_parsed_block = $this->inner_blocks[ $index ]->parsed_block;
-                    $block_content       .= $this->inner_blocks[ $index++ ]->render();
-                    $current_parsed_block = $parent_parsed_block;
-                }
+                $block_content .= is_string( $chunk ) ?
+                    $chunk :
+                    $this->inner_blocks[ $index++ ]->render();
             }
         }

gutenberg/trunk/lib/compat.php

@@ -509 +509 @@
 }
 add_filter( 'post_type_labels_wp_block', 'gutenberg_override_reusable_block_post_type_labels', 10, 0 );
-
-global $current_parsed_block;
-$current_parsed_block = array(
-    'blockName'  => null,
-    'attributes' => null,
-);
-
-/**
- * Wraps the render_callback of dynamic blocks to keep track
- * of the current block being rendered via a global variable
- * called $current_parsed_block.
- *
- * This is for get_block_wrapper_attributes to get access
- * to the runtime data of the block being rendered.
- *
- * This shim can be removed when the plugin requires WordPress 5.6.
- *
- * @since 9.2.1
- *
- * @param array $args Block attributes.
- * @return array Block attributes.
- */
-function gutenberg_current_parsed_block_tracking( $args ) {
-    if ( null !== $args['render_callback'] ) {
-        $block_render_callback   = $args['render_callback'];
-        $args['render_callback'] = function( $attributes, $content, $block ) use ( $block_render_callback ) {
-            global $current_parsed_block;
-            $parent_parsed_block  = $current_parsed_block;
-            $current_parsed_block = $block->parsed_block;
-            $result               = $block_render_callback( $attributes, $content, $block );
-            $current_parsed_block = $parent_parsed_block;
-            return $result;
-        };
-    }
-    return $args;
-}
-add_filter( 'register_block_type_args', 'gutenberg_current_parsed_block_tracking' );

gutenberg/trunk/readme.txt

@@ -4 +4 @@
 Tested up to: 5.5
 Requires PHP: 5.6
-Stable tag: 9.2.1
+Stable tag: 9.2.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -58 +58 @@
 == Changelog ==
 
-To read the changelog for Gutenberg 9.2.1, please navigate to the <a href="https://github.com/WordPress/gutenberg/releases/tag/v9.2.1">release page</a>.
+To read the changelog for Gutenberg 9.2.2, please navigate to the <a href="https://github.com/WordPress/gutenberg/releases/tag/v9.2.2">release page</a>.