mirror of
https://github.com/gosticks/wordpress-develop.git
synced 2026-04-08 14:44:37 +00:00
Update editor related npm packages for 6.4 RC1.
The npm packages needed a second part to the update for 6.4 RC1. Props isabel_brison, andrewserong, jsnajdr, wildworks, joen, mciampini, tyxla, youknowriad, ramonopoly, spacedmonkey, dmsnell, mikachan, kishanjasani, czapla, siobhyb, darerodz, luisherranz See #59411. git-svn-id: https://develop.svn.wordpress.org/trunk@56945 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
File diff suppressed because one or more lines are too long
@@ -170,8 +170,8 @@ function block_core_image_render_lightbox( $block_content, $block ) {
|
||||
if ( isset( $block['attrs']['id'] ) ) {
|
||||
$img_uploaded_src = wp_get_attachment_url( $block['attrs']['id'] );
|
||||
$img_metadata = wp_get_attachment_metadata( $block['attrs']['id'] );
|
||||
$img_width = $img_metadata['width'];
|
||||
$img_height = $img_metadata['height'];
|
||||
$img_width = $img_metadata['width'] ?? 'none';
|
||||
$img_height = $img_metadata['height'] ?? 'none';
|
||||
} else {
|
||||
$img_uploaded_src = $processor->get_attribute( 'src' );
|
||||
$img_width = 'none';
|
||||
|
||||
@@ -38,6 +38,7 @@ function render_block_core_post_navigation_link( $attributes, $content ) {
|
||||
$link = 'next' === $navigation_type ? _x( 'Next', 'label for next post link' ) : _x( 'Previous', 'label for previous post link' );
|
||||
$label = '';
|
||||
|
||||
// Only use hardcoded values here, otherwise we need to add escaping where these values are used.
|
||||
$arrow_map = array(
|
||||
'none' => '',
|
||||
'arrow' => array(
|
||||
@@ -88,7 +89,7 @@ function render_block_core_post_navigation_link( $attributes, $content ) {
|
||||
}
|
||||
|
||||
// Display arrows.
|
||||
if ( isset( $attributes['arrow'] ) && ! empty( $attributes['arrow'] ) && 'none' !== $attributes['arrow'] ) {
|
||||
if ( isset( $attributes['arrow'] ) && 'none' !== $attributes['arrow'] && isset( $arrow_map[ $attributes['arrow'] ] ) ) {
|
||||
$arrow = $arrow_map[ $attributes['arrow'] ][ $navigation_type ];
|
||||
|
||||
if ( 'next' === $navigation_type ) {
|
||||
|
||||
@@ -48,14 +48,6 @@ class WP_Block_Parser {
|
||||
*/
|
||||
public $stack;
|
||||
|
||||
/**
|
||||
* Empty associative array, here due to PHP quirks
|
||||
*
|
||||
* @since 4.4.0
|
||||
* @var array empty associative array
|
||||
*/
|
||||
public $empty_attrs;
|
||||
|
||||
/**
|
||||
* Parses a document and returns a list of block structures
|
||||
*
|
||||
@@ -69,11 +61,10 @@ class WP_Block_Parser {
|
||||
* @return array[]
|
||||
*/
|
||||
public function parse( $document ) {
|
||||
$this->document = $document;
|
||||
$this->offset = 0;
|
||||
$this->output = array();
|
||||
$this->stack = array();
|
||||
$this->empty_attrs = array();
|
||||
$this->document = $document;
|
||||
$this->offset = 0;
|
||||
$this->output = array();
|
||||
$this->stack = array();
|
||||
|
||||
while ( $this->proceed() ) {
|
||||
continue;
|
||||
@@ -287,7 +278,7 @@ class WP_Block_Parser {
|
||||
*/
|
||||
$attrs = $has_attrs
|
||||
? json_decode( $matches['attrs'][0], /* as-associative */ true )
|
||||
: $this->empty_attrs;
|
||||
: array();
|
||||
|
||||
/*
|
||||
* This state isn't allowed
|
||||
@@ -318,7 +309,7 @@ class WP_Block_Parser {
|
||||
* @return WP_Block_Parser_Block freeform block object.
|
||||
*/
|
||||
public function freeform( $inner_html ) {
|
||||
return new WP_Block_Parser_Block( null, $this->empty_attrs, array(), $inner_html, array( $inner_html ) );
|
||||
return new WP_Block_Parser_Block( null, array(), array(), $inner_html, array( $inner_html ) );
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user