Changes in trunk/wp-admin/update.php [16860:14985]

File:

• trunk/wp-admin/update.php (modified) (16 diffs)

trunk/wp-admin/update.php

@@ -7 +7 @@
  */
 
-if ( ! defined( 'IFRAME_REQUEST' ) && isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'update-selected', 'activate-plugin', 'update-selected-themes' ) ) )
-        define( 'IFRAME_REQUEST', true );
-
 /** WordPress Administration Bootstrap */
 require_once('./admin.php');
@@ -38 +35 @@
                 $nonce = 'bulk-update-plugins';
 
+                require_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
                 wp_enqueue_script('jquery');
                 iframe_header();
@@ -52 +50 @@
                 check_admin_referer('upgrade-plugin_' . $plugin);
 
-                $title = __('Update Plugin');
+                $title = __('Upgrade Plugin');
                 $parent_file = 'plugins.php';
                 $submenu_file = 'plugins.php';
-                require_once(ABSPATH . 'wp-admin/admin-header.php');
+                require_once('./admin-header.php');
 
                 $nonce = 'upgrade-plugin_' . $plugin;
@@ -63 +61 @@
                 $upgrader->upgrade($plugin);
 
-                include(ABSPATH . 'wp-admin/admin-footer.php');
+                include('./admin-footer.php');
 
         } elseif ('activate-plugin' == $action ) {
@@ -71 +69 @@
                 check_admin_referer('activate-plugin_' . $plugin);
                 if ( ! isset($_GET['failure']) && ! isset($_GET['success']) ) {
-                        wp_redirect( admin_url('update.php?action=activate-plugin&failure=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce']) );
-                        activate_plugin( $plugin, '', ! empty( $_GET['networkwide'] ), true );
-                        wp_redirect( admin_url('update.php?action=activate-plugin&success=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce']) );
+                        wp_redirect( 'update.php?action=activate-plugin&failure=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce'] );
+                        activate_plugin( $plugin, '', ! empty( $_GET['networkwide'] ) );
+                        wp_redirect( 'update.php?action=activate-plugin&success=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce'] );
                         die();
                 }
@@ -108 +106 @@
                 $parent_file = 'plugins.php';
                 $submenu_file = 'plugin-install.php';
-                require_once(ABSPATH . 'wp-admin/admin-header.php');
+                require_once('./admin-header.php');
 
                 $title = sprintf( __('Installing Plugin: %s'), $api->name . ' ' . $api->version );
@@ -121 +119 @@
                 $upgrader->install($api->download_link);
 
-                include(ABSPATH . 'wp-admin/admin-footer.php');
+                include('./admin-footer.php');
 
         } elseif ( 'upload-plugin' == $action ) {
@@ -135 +133 @@
                 $parent_file = 'plugins.php';
                 $submenu_file = 'plugin-install.php';
-                require_once(ABSPATH . 'wp-admin/admin-header.php');
+                require_once('./admin-header.php');
 
                 $title = sprintf( __('Installing Plugin from uploaded file: %s'), basename( $file_upload->filename ) );
@@ -145 +143 @@
                 $upgrader->install( $file_upload->package );
 
-                include(ABSPATH . 'wp-admin/admin-footer.php');
+                include('./admin-footer.php');
 
         } elseif ( 'upgrade-theme' == $action ) {
@@ -156 +154 @@
                 add_thickbox();
                 wp_enqueue_script('theme-preview');
-                $title = __('Update Theme');
+                $title = __('Upgrade Theme');
                 $parent_file = 'themes.php';
                 $submenu_file = 'themes.php';
-                require_once(ABSPATH . 'wp-admin/admin-header.php');
+                require_once('./admin-header.php');
 
                 $nonce = 'upgrade-theme_' . $theme;
@@ -167 +165 @@
                 $upgrader->upgrade($theme);
 
-                include(ABSPATH . 'wp-admin/admin-footer.php');
+                include('./admin-footer.php');
         } elseif ( 'update-selected-themes' == $action ) {
                 if ( ! current_user_can( 'update_themes' ) )
@@ -186 +184 @@
                 $nonce = 'bulk-update-themes';
 
+                require_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
                 wp_enqueue_script('jquery');
                 iframe_header();
@@ -211 +210 @@
                 $parent_file = 'themes.php';
                 $submenu_file = 'themes.php';
-                require_once(ABSPATH . 'wp-admin/admin-header.php');
+                require_once('./admin-header.php');
 
                 $title = sprintf( __('Installing Theme: %s'), $api->name . ' ' . $api->version );
@@ -221 +220 @@
                 $upgrader->install($api->download_link);
 
-                include(ABSPATH . 'wp-admin/admin-footer.php');
+                include('./admin-footer.php');
 
         } elseif ( 'upload-theme' == $action ) {
@@ -237 +236 @@
                 add_thickbox();
                 wp_enqueue_script('theme-preview');
-                require_once(ABSPATH . 'wp-admin/admin-header.php');
+                require_once('./admin-header.php');
 
                 $title = sprintf( __('Installing Theme from uploaded file: %s'), basename( $file_upload->filename ) );
@@ -247 +246 @@
                 $upgrader->install( $file_upload->package );
 
-                include(ABSPATH . 'wp-admin/admin-footer.php');
+                include('./admin-footer.php');
 
         } else {