Ticket #19450: 19450.2.diff

src/wp-includes/widgets.php

@@ -1352 +1352 @@
         if ( !is_a($widget_obj, 'WP_Widget') )
                 return;
 
-        $before_widget = sprintf('<div class="widget %s">', $widget_obj->widget_options['classname'] );
-        $default_args = array( 'before_widget' => $before_widget, 'after_widget' => "</div>", 'before_title' => '<h2 class="widgettitle">', 'after_title' => '</h2>' );
+        $default_args = array(
+                'before_widget' => '<div class="widget %s">',
+                'after_widget'  => "</div>",
+                'before_title'  => '<h2 class="widgettitle">',
+                'after_title'   => '</h2>',
+        );
+        $args = wp_parse_args( $args, $default_args );
+        $args['before_widget'] = sprintf( $args['before_widget'], $widget_obj->widget_options['classname'] );
 
-        $args = wp_parse_args($args, $default_args);
         $instance = wp_parse_args($instance);
 
         /**

tests/phpunit/tests/widgets.php

@@ -75 +75 @@
                 $this->assertFalse( isset( $wp_registered_sidebars['sidebar-1'] ) );
 
         }
+
+        function test_the_widget_custom_before_title_arg() {
+
+                ob_start();
+                the_widget(
+                        'WP_Widget_Text',
+                        array( 'title' => 'Notes', 'text' => 'Sample text' ),
+                        array( 'before_widget' => '<span class="special %s">', 'after_widget' => '</span>' )
+                );
+                $actual = ob_get_clean();
+
+                $this->assertRegExp( '/<span class="special widget_text">/', $actual );
+
+        }
+
 }