Changeset 34465 for trunk/src/wp-includes/widget-functions.php

Timestamp:

09/24/2015 12:29:54 AM (9 years ago)

Author:

wonderboymusic

Message:

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.

File:

• trunk/src/wp-includes/widget-functions.php (modified) (1 diff)

trunk/src/wp-includes/widget-functions.php

@@ -502 +502 @@
  * @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;