sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests 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.

Browse Source 
Adds unit test.

Props tyxla, fjarrett.
Fixes #23423.


git-svn-id: https://develop.svn.wordpress.org/trunk@34465 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor 2015-09-24 00:29:54 +00:00
parent 9209546292
commit c1c93f1e95
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/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. * @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. * @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; global $wp_registered_sidebars, $wp_registered_widgets;
if ( is_int($index) ) { if ( is_int( $index ) ) {
$index = "sidebar-$index"; $index = "sidebar-$index";
} else { } else {
$index = sanitize_title($index); $sanitized_index = sanitize_title( $index );
foreach ( (array) $wp_registered_sidebars as $key => $value ) { foreach ( (array) $wp_registered_sidebars as $key => $value ) {
if ( sanitize_title($value['name']) == $index ) { if ( sanitize_title( $value['name'] ) == $sanitized_index ) {
$index = $key; $index = $key;
break; break;
} }

17
tests/phpunit/tests/widgets.php
View File

@ -293,4 +293,21 @@ class Tests_Widgets extends WP_UnitTestCase {
$this->assertArrayNotHasKey( 2, $option_value ); $this->assertArrayNotHasKey( 2, $option_value );
} }
/**
* @ticket 23423
*/
function test_dynamic_sidebar_id_special_characters() {
wp_widgets_init();
register_sidebar( array(
'name' => 'Sidebar 2',
'id' => 'sidebar-2',
) );
ob_start();
$result = dynamic_sidebar( 'Sidebar 1' );
ob_end_clean();
$this->assertFalse( $result );
}
} }