Changeset 36148

Timestamp:

01/02/2016 03:38:45 AM (7 years ago)

Author:

dd32

Message:

Widgets: Revert [34465], as it introduced a regression, making the $index argument of dynamic_sidebar() case-sensitive.

Merges [36130] to the 4.4 branch.
See #23423.
Fixes #34995.

Location:

branches/4.4

Files:

• . (modified) (1 prop)
• src/wp-includes/widgets.php (modified) (1 diff)
• tests/phpunit/tests/widgets.php (modified) (1 diff)

branches/4.4/src/wp-includes/widgets.php

@@ -608 +608 @@
         $index = "sidebar-$index";
     } else {
-        $sanitized_index = sanitize_title( $index );
+        $index = sanitize_title( $index );
         foreach ( (array) $wp_registered_sidebars as $key => $value ) {
-            if ( sanitize_title( $value['name'] ) == $sanitized_index ) {
+            if ( sanitize_title( $value['name'] ) == $index ) {
                 $index = $key;
                 break;

branches/4.4/tests/phpunit/tests/widgets.php

@@ -534 +534 @@
         $option_value = get_option( $wp_widget_search->option_name );
         $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 );
     }