vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-11 12:20:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better protection against double widget insertion. Fixes #6191 props mdawaffe.

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@7275 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Peter Westwood
2008-03-13 21:33:11 +00:00
parent 29b3ff82c1
commit e63fc7126a
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wp-admin/includes/widgets.php
+10 -4
View File
@@ -48,7 +48,7 @@ function wp_list_widgets( $show = 'all', $_search = false ) {
ob_start();
$args = wp_list_widget_controls_dynamic_sidebar( array( 0 => array( 'widget_id' => $widget['id'], 'widget_name' => $widget['name'], '_display' => 'template' ) ) );
call_user_func_array( 'wp_widget_control', $args );
$sidebar_args = call_user_func_array( 'wp_widget_control', $args );
$widget_control_template = ob_get_contents();
ob_end_clean();
@@ -70,9 +70,12 @@ function wp_list_widgets( $show = 'all', $_search = false ) {
'edit' => $widget['id'],
'key' => array_search( $widget['id'], $sidebars_widgets[$sidebar] ),
) ) );
$widget_control_template = '<li><textarea rows="1" cols="1">' . htmlspecialchars( $widget_control_template ) . '</textarea></li>';
$widget_control_template = '<textarea rows="1" cols="1">' . htmlspecialchars( $widget_control_template ) . '</textarea>';
}
$widget_control_template = $sidebar_args['before_widget'] . $widget_control_template . $sidebar_args['after_widget'];
$no_widgets_shown = false;
?>
@@ -201,7 +204,8 @@ function wp_widget_control( $sidebar_args ) {
$widget_title = wp_specialchars( strip_tags( $sidebar_args['widget_name'] ) );
echo $sidebar_args['before_widget'];
if ( empty($sidebar_args['_display']) || 'template' != $sidebar_args['_display'] )
echo $sidebar_args['before_widget'];
?>
<h4 class="widget-title"><?php echo $widget_title ?>
@@ -242,7 +246,9 @@ function wp_widget_control( $sidebar_args ) {
</div>
</div>
<?php
echo $sidebar_args['after_widget'];
if ( empty($sidebar_args['_display']) || 'template' != $sidebar_args['_display'] )
echo $sidebar_args['after_widget'];
return $sidebar_args;
}
function wp_widget_control_ob_filter( $string ) {