Ticket #19450: 19450.diff

wp-includes/widgets.php

@@ -1125 +1125 @@
         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);
 
         do_action( 'the_widget', $widget, $instance, $args );