Changeset 51268 for trunk/src/wp-includes/blocks.php

Timestamp:

06/30/2021 02:13:30 AM (4 years ago)

Author:

desrosj

Message:

Build/Test Tools: Revert [51259-51256,51265].

[51259] introduced a PHP notice that was not actually fixed by [51265]. Reverting these changes in order to investigate further.

See #53397.

File:

• trunk/src/wp-includes/blocks.php (modified) (5 diffs)

trunk/src/wp-includes/blocks.php

@@ -43 +43 @@
             $asset_handle .= '-editor';
         }
-        if ( 0 === strpos( $field_name, 'view' ) ) {
-            $asset_handle .= '-view';
-        }
         return $asset_handle;
     }
@@ -52 +49 @@
         'editorScript' => 'editor-script',
         'script'       => 'script',
-        'viewScript'   => 'view-script',
         'editorStyle'  => 'editor-style',
         'style'        => 'style',
@@ -106 +102 @@
         return false;
     }
-    $is_core_block       = isset( $metadata['file'] ) && 0 === strpos( $metadata['file'], ABSPATH . WPINC );
-    $script_uri          = $is_core_block ?
-        includes_url( str_replace( ABSPATH . WPINC, '', realpath( dirname( $metadata['file'] ) . '/' . $script_path ) ) ) :
-        plugins_url( $script_path, $metadata['file'] );
-    $script_asset        = require $script_asset_path;
-    $script_dependencies = isset( $script_asset['dependencies'] ) ? $script_asset['dependencies'] : array();
-    $result              = wp_register_script(
+    $script_asset = require $script_asset_path;
+    $result       = wp_register_script(
         $script_handle,
-        $script_uri,
-        $script_dependencies,
-        isset( $script_asset['version'] ) ? $script_asset['version'] : false
+        plugins_url( $script_path, $metadata['file'] ),
+        $script_asset['dependencies'],
+        $script_asset['version']
     );
     if ( ! $result ) {
@@ -122 +113 @@
     }
 
-    if ( ! empty( $metadata['textdomain'] ) && in_array( 'wp-i18n', $script_dependencies ) ) {
+    if ( ! empty( $metadata['textdomain'] ) ) {
         wp_set_script_translations( $script_handle, $metadata['textdomain'] );
     }
@@ -321 +312 @@
     }
 
-    if ( ! empty( $metadata['viewScript'] ) ) {
-        $settings['view_script'] = register_block_script_handle(
-            $metadata,
-            'viewScript'
-        );
-    }
-
     if ( ! empty( $metadata['editorStyle'] ) ) {
         $settings['editor_style'] = register_block_style_handle(