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

Widgets: when passing a string arg value to `dynamic_sidebar()`, don't reset `$index` when the arg's sanitized value matches the sanitized name of a sidebar. 

Adds unit test.

Props tyxla, fjarrett.
Fixes #23423.

Built from https://develop.svn.wordpress.org/trunk@34465


git-svn-id: http://core.svn.wordpress.org/trunk@34429 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-09-24 00:30:24 +00:00
parent ad2ddad259
commit 627e7a56d3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.4-alpha-34464';
$wp_version = '4.4-alpha-34465';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

8
wp-includes/widget-functions.php
View File

@ -501,15 +501,15 @@ function wp_unregister_widget_control($id) {
* @param int|string $index Optional, default is 1. Index, name or ID of dynamic sidebar.
* @return bool True, if widget sidebar was found and called. False if not found or not called.
*/
function dynamic_sidebar($index = 1) {
function dynamic_sidebar( $index = 1 ) {
global $wp_registered_sidebars, $wp_registered_widgets;
if ( is_int($index) ) {
if ( is_int( $index ) ) {
$index = "sidebar-$index";
} else {
$index = sanitize_title($index);
$sanitized_index = sanitize_title( $index );
foreach ( (array) $wp_registered_sidebars as $key => $value ) {
if ( sanitize_title($value['name']) == $index ) {
if ( sanitize_title( $value['name'] ) == $sanitized_index ) {
$index = $key;
break;
}