Ticket #14785: 14785.diff

wp-admin/includes/dashboard.php

@@ -121 +121 @@
 
 function wp_add_dashboard_widget( $widget_id, $widget_name, $callback, $control_callback = null ) {
         global $wp_dashboard_control_callbacks;
+
         if ( $control_callback && current_user_can( 'edit_dashboard' ) && is_callable( $control_callback ) ) {
                 $wp_dashboard_control_callbacks[$widget_id] = $control_callback;
                 if ( isset( $_GET['edit'] ) && $widget_id == $_GET['edit'] ) {
                         list($url) = explode( '#', add_query_arg( 'edit', false ), 2 );
                         $widget_name .= ' <span class="postbox-title-action"><a href="' . esc_url( $url ) . '">' . __( 'Cancel' ) . '</a></span>';
-                        add_meta_box( $widget_id, $widget_name, '_wp_dashboard_control_callback', 'dashboard', 'normal', 'core' );
-                        return;
+                        $callback = '_wp_dashboard_control_callback';
+                } else {
+                        list($url) = explode( '#', add_query_arg( 'edit', $widget_id ), 2 );
+                        $widget_name .= ' <span class="postbox-title-action"><a href="' . esc_url( "$url#$widget_id" ) . '" class="edit-box open-box">' . __( 'Configure' ) . '</a></span>';
                 }
-                list($url) = explode( '#', add_query_arg( 'edit', $widget_id ), 2 );
-                $widget_name .= ' <span class="postbox-title-action"><a href="' . esc_url( "$url#$widget_id" ) . '" class="edit-box open-box">' . __( 'Configure' ) . '</a></span>';
         }
+
         $side_widgets = array('dashboard_quick_press', 'dashboard_recent_drafts', 'dashboard_primary', 'dashboard_secondary');
         $location = 'normal';
         if ( in_array($widget_id, $side_widgets) )
@@ -143 +145 @@
         echo '<form action="" method="post" class="dashboard-widget-control-form">';
         wp_dashboard_trigger_widget_control( $meta_box['id'] );
         echo '<p class="submit"><input type="hidden" name="widget_id" value="' . esc_attr($meta_box['id']) . '" /><input type="submit" value="' . esc_attr__( 'Submit' ) . '" /></p>';
-
         echo '</form>';
 }