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

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