WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Widgets: Make sure `WP_Widget` constructor creates a correct `classname` value for a namespaced widget class. 

This reverts the changes to `id_base` from [50953] due to backward compatibility concerns, and instead focuses on the `id` and `class` attributes specifically.

With this change, any backslashes in the `id` or `class` attributes for a namespaced widget class are converted to underscores, making it easier to style the output or target the widget with JavaScript.

Follow-up to [50953].

Fixes #44098.
Built from https://develop.svn.wordpress.org/trunk@50961


git-svn-id: http://core.svn.wordpress.org/trunk@50570 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2021-05-24 09:51:56 +00:00
parent 3143af5910
commit aabce962ae
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/widgets.php
View File

@ -162,7 +162,7 @@ function next_widget_id_number( $id_base ) {
$number = 1; $number = 1;
foreach ( $wp_registered_widgets as $widget_id => $widget ) { foreach ( $wp_registered_widgets as $widget_id => $widget ) {
if ( preg_match( '/' . $id_base . '-([0-9]+)$/', $widget_id, $matches ) ) { if ( preg_match( '/' . preg_quote( $id_base, '/' ) . '-([0-9]+)$/', $widget_id, $matches ) ) {
$number = max( $number, $matches[1] ); $number = max( $number, $matches[1] );
} }
} }

3
wp-includes/class-wp-widget.php
View File

@ -164,7 +164,6 @@ class WP_Widget {
$id_base = strtolower( $id_base ); $id_base = strtolower( $id_base );
} else { } else {
$id_base = preg_replace( '/(wp_)?widget_/', '', strtolower( get_class( $this ) ) ); $id_base = preg_replace( '/(wp_)?widget_/', '', strtolower( get_class( $this ) ) );
$id_base = str_replace( '\\', '-', $id_base );
} }
$this->id_base = $id_base; $this->id_base = $id_base;
@ -173,7 +172,7 @@ class WP_Widget {
$this->widget_options = wp_parse_args( $this->widget_options = wp_parse_args(
$widget_options, $widget_options,
array( array(
'classname' => $this->option_name, 'classname' => str_replace( '\\', '_', $this->option_name ),
'customize_selective_refresh' => false, 'customize_selective_refresh' => false,
) )
); );

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.8-alpha-50960'; $wp_version = '5.8-alpha-50961';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

9
wp-includes/widgets.php
View File

@ -753,8 +753,13 @@ function dynamic_sidebar( $index = 1 ) {
$classname_ .= '_' . get_class( $cn ); $classname_ .= '_' . get_class( $cn );
} }
} }
$classname_ = ltrim( $classname_, '_' ); $classname_ = ltrim( $classname_, '_' );
$params[0]['before_widget'] = sprintf( $params[0]['before_widget'], $id, $classname_ );
$params[0]['before_widget'] = sprintf(
$params[0]['before_widget'],
str_replace( '\\', '_', $id ),
$classname_
);
/** /**
* Filters the parameters passed to a widget's display callback. * Filters the parameters passed to a widget's display callback.