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

Timestamp:

10/13/2015 01:48:41 AM (9 years ago)

Author:

wonderboymusic

Message:

Widgets: When using the_widget(), the $before_widget argument only receives the widget class if using the default sidebar arguments. Run sprintf after parsing the args to fix this.

Adds unit test.

Props coffee2code.
Fixes #19450.

File:

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

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

@@ -950 +950 @@
     }
 
-    $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>' );
-
-    $args = wp_parse_args($args, $default_args);
+    $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'] );
+
     $instance = wp_parse_args($instance);