Changeset 20190

Timestamp:

03/15/2012 01:20:00 PM (14 years ago)

Author:

nacin

Message:

Remove index-extra.php. Move dashboard widget XHR callbacks to ajax-actions.php. fixes #20242.

Location:

trunk/wp-admin

Files:

• admin-ajax.php (modified) (1 diff)
• includes/ajax-actions.php (modified) (1 diff)
• includes/update-core.php (modified) (1 diff)
• index-extra.php (deleted)
• js/dashboard.dev.js (modified) (1 diff)
• network/index-extra.php (deleted)
• user/index-extra.php (deleted)

trunk/wp-admin/admin-ajax.php

@@ -35 +35 @@
 do_action( 'admin_init' );
 
-$core_actions_get = array( 'fetch-list', 'ajax-tag-search', 'wp-compression-test', 'imgedit-preview', 'oembed-cache', 'autocomplete-user' );
+$core_actions_get = array(
+    'fetch-list', 'ajax-tag-search', 'wp-compression-test', 'imgedit-preview', 'oembed-cache',
+    'autocomplete-user', 'dashboard-widgets',
+);
 
 $core_actions_post = array(

trunk/wp-admin/includes/ajax-actions.php

@@ -185 +185 @@
 
     wp_die( json_encode( $return ) );
+}
+
+function wp_ajax_dashboard_widgets() {
+    require ABSPATH . 'wp-admin/includes/dashboard.php';
+
+    switch ( $_GET['widget'] ) {
+        case 'dashboard_incoming_links' :
+            wp_dashboard_incoming_links();
+            break;
+        case 'dashboard_primary' :
+            wp_dashboard_primary();
+            break;
+        case 'dashboard_secondary' :
+            wp_dashboard_secondary();
+            break;
+        case 'dashboard_plugins' :
+            wp_dashboard_plugins();
+            break;
+    }
+    wp_die();
 }
 

trunk/wp-admin/includes/update-core.php

@@ -328 +328 @@
 // 3.4
 'wp-admin/images/logo-login.png',
+'wp-admin/index-extra.php',
+'wp-admin/network/index-extra.php',
+'wp-admin/user/index-extra.php',
 );
 

trunk/wp-admin/js/dashboard.dev.js

@@ -42 +42 @@
                 p = e.parent();
                 setTimeout( function(){
-                    p.load( ajaxurl.replace( '/admin-ajax.php', '' ) + '/index-extra.php?jax=' + id, '', function() {
+                    p.load( ajaxurl + '?action=dashboard-widgets&widget=' + id, '', function() {
                         p.hide().slideDown('normal', function(){
                             $(this).css('display', '');