Wordpress 3.1.2

[autoinstalls/wordpress.git] / wp-admin / update.php

diff --git a/wp-admin/update.php b/wp-admin/update.php
index 0664ac8f368ba07d787c98f6afdc6e1e87f34984..8dd8a89bb2b391a5aeae53f99edc96f0ef802ec2 100644 (file)
--- a/wp-admin/update.php
+++ b/wp-admin/update.php
@@ -6,6 +6,9 @@
  * @subpackage Administration
  */
 
+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');
 
@@ -34,7 +37,6 @@ if ( isset($_GET['action']) ) {
                $url = 'update.php?action=update-selected&plugins=' . urlencode(implode(',', $plugins));
                $nonce = 'bulk-update-plugins';
 
-               require_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
                wp_enqueue_script('jquery');
                iframe_header();
 
@@ -49,10 +51,10 @@ if ( isset($_GET['action']) ) {
 
                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;
                $url = 'update.php?action=upgrade-plugin&plugin=' . $plugin;
@@ -60,7 +62,7 @@ if ( isset($_GET['action']) ) {
                $upgrader = new Plugin_Upgrader( new Plugin_Upgrader_Skin( compact('title', 'nonce', 'url', 'plugin') ) );
                $upgrader->upgrade($plugin);
 
-               include('./admin-footer.php');
+               include(ABSPATH . 'wp-admin/admin-footer.php');
 
        } elseif ('activate-plugin' == $action ) {
                if ( ! current_user_can('update_plugins') )
@@ -68,9 +70,9 @@ if ( isset($_GET['action']) ) {
 
                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();
                }
                iframe_header( __('Plugin Reactivation'), true );
@@ -105,7 +107,7 @@ if ( isset($_GET['action']) ) {
                $title = __('Plugin Install');
                $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 );
                $nonce = 'install-plugin_' . $plugin;
@@ -118,7 +120,7 @@ if ( isset($_GET['action']) ) {
                $upgrader = new Plugin_Upgrader( new Plugin_Installer_Skin( compact('title', 'url', 'nonce', 'plugin', 'api') ) );
                $upgrader->install($api->download_link);
 
-               include('./admin-footer.php');
+               include(ABSPATH . 'wp-admin/admin-footer.php');
 
        } elseif ( 'upload-plugin' == $action ) {
 
@@ -132,7 +134,7 @@ if ( isset($_GET['action']) ) {
                $title = __('Upload Plugin');
                $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 ) );
                $nonce = 'plugin-upload';
@@ -142,7 +144,7 @@ if ( isset($_GET['action']) ) {
                $upgrader = new Plugin_Upgrader( new Plugin_Installer_Skin( compact('type', 'title', 'nonce', 'url') ) );
                $upgrader->install( $file_upload->package );
 
-               include('./admin-footer.php');
+               include(ABSPATH . 'wp-admin/admin-footer.php');
 
        } elseif ( 'upgrade-theme' == $action ) {
 
@@ -153,10 +155,10 @@ if ( isset($_GET['action']) ) {
 
                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;
                $url = 'update.php?action=upgrade-theme&theme=' . $theme;
@@ -164,7 +166,7 @@ if ( isset($_GET['action']) ) {
                $upgrader = new Theme_Upgrader( new Theme_Upgrader_Skin( compact('title', 'nonce', 'url', 'theme') ) );
                $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' ) )
                        wp_die( __( 'You do not have sufficient permissions to update themes for this site.' ) );
@@ -183,7 +185,6 @@ if ( isset($_GET['action']) ) {
                $url = 'update.php?action=update-selected-themes&themes=' . urlencode(implode(',', $themes));
                $nonce = 'bulk-update-themes';
 
-               require_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
                wp_enqueue_script('jquery');
                iframe_header();
 
@@ -209,7 +210,7 @@ if ( isset($_GET['action']) ) {
                $title = __('Install Themes');
                $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 );
                $nonce = 'install-theme_' . $theme;
@@ -219,7 +220,7 @@ if ( isset($_GET['action']) ) {
                $upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact('title', 'url', 'nonce', 'plugin', 'api') ) );
                $upgrader->install($api->download_link);
 
-               include('./admin-footer.php');
+               include(ABSPATH . 'wp-admin/admin-footer.php');
 
        } elseif ( 'upload-theme' == $action ) {
 
@@ -235,7 +236,7 @@ if ( isset($_GET['action']) ) {
                $submenu_file = 'theme-install.php';
                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 ) );
                $nonce = 'theme-upload';
@@ -245,7 +246,7 @@ if ( isset($_GET['action']) ) {
                $upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact('type', 'title', 'nonce', 'url') ) );
                $upgrader->install( $file_upload->package );
 
-               include('./admin-footer.php');
+               include(ABSPATH . 'wp-admin/admin-footer.php');
 
        } else {
                do_action('update-custom_' . $action);