WordPress 3.7.2

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

diff --git a/wp-admin/update.php b/wp-admin/update.php
index 8dd8a89bb2b391a5aeae53f99edc96f0ef802ec2..b89ada27deeeeee7185e050d1a166fd35e910fab 100644 (file)
--- a/wp-admin/update.php
+++ b/wp-admin/update.php
@@ -10,7 +10,7 @@ if ( ! defined( 'IFRAME_REQUEST' ) && isset( $_GET['action'] ) && in_array( $_GE
        define( 'IFRAME_REQUEST', true );
 
 /** WordPress Administration Bootstrap */
-require_once('./admin.php');
+require_once( dirname( __FILE__ ) . '/admin.php' );
 
 include_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
 
@@ -57,7 +57,7 @@ if ( isset($_GET['action']) ) {
                require_once(ABSPATH . 'wp-admin/admin-header.php');
 
                $nonce = 'upgrade-plugin_' . $plugin;
-               $url = 'update.php?action=upgrade-plugin&plugin=' . $plugin;
+               $url = 'update.php?action=upgrade-plugin&plugin=' . urlencode( $plugin );
 
                $upgrader = new Plugin_Upgrader( new Plugin_Upgrader_Skin( compact('title', 'nonce', 'url', 'plugin') ) );
                $upgrader->upgrade($plugin);
@@ -70,9 +70,9 @@ if ( isset($_GET['action']) ) {
 
                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']) );
+                       wp_redirect( admin_url('update.php?action=activate-plugin&failure=true&plugin=' . urlencode( $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( admin_url('update.php?action=activate-plugin&success=true&plugin=' . urlencode( $plugin ) . '&_wpnonce=' . $_GET['_wpnonce']) );
                        die();
                }
                iframe_header( __('Plugin Reactivation'), true );
@@ -82,11 +82,7 @@ if ( isset($_GET['action']) ) {
                if ( isset($_GET['failure']) ){
                        echo '<p>' . __('Plugin failed to reactivate due to a fatal error.') . '</p>';
 
-                       if ( defined('E_RECOVERABLE_ERROR') )
-                               error_reporting(E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR);
-                       else
-                               error_reporting(E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING);
-
+                       error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
                        @ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
                        include(WP_PLUGIN_DIR . '/' . $plugin);
                }
@@ -94,7 +90,7 @@ if ( isset($_GET['action']) ) {
        } elseif ( 'install-plugin' == $action ) {
 
                if ( ! current_user_can('install_plugins') )
-                       wp_die(__('You do not have sufficient permissions to install plugins for this site.'));
+                       wp_die( __( 'You do not have sufficient permissions to install plugins on this site.' ) );
 
                include_once ABSPATH . 'wp-admin/includes/plugin-install.php'; //for plugins_api..
 
@@ -111,7 +107,7 @@ if ( isset($_GET['action']) ) {
 
                $title = sprintf( __('Installing Plugin: %s'), $api->name . ' ' . $api->version );
                $nonce = 'install-plugin_' . $plugin;
-               $url = 'update.php?action=install-plugin&plugin=' . $plugin;
+               $url = 'update.php?action=install-plugin&plugin=' . urlencode( $plugin );
                if ( isset($_GET['from']) )
                        $url .= '&from=' . urlencode(stripslashes($_GET['from']));
 
@@ -125,7 +121,7 @@ if ( isset($_GET['action']) ) {
        } elseif ( 'upload-plugin' == $action ) {
 
                if ( ! current_user_can('install_plugins') )
-                       wp_die(__('You do not have sufficient permissions to install plugins for this site.'));
+                       wp_die( __( 'You do not have sufficient permissions to install plugins on this site.' ) );
 
                check_admin_referer('plugin-upload');
 
@@ -136,13 +132,16 @@ if ( isset($_GET['action']) ) {
                $submenu_file = 'plugin-install.php';
                require_once(ABSPATH . 'wp-admin/admin-header.php');
 
-               $title = sprintf( __('Installing Plugin from uploaded file: %s'), basename( $file_upload->filename ) );
+               $title = sprintf( __('Installing Plugin from uploaded file: %s'), esc_html( basename( $file_upload->filename ) ) );
                $nonce = 'plugin-upload';
-               $url = add_query_arg(array('package' => $file_upload->filename ), 'update.php?action=upload-plugin');
+               $url = add_query_arg(array('package' => $file_upload->id), 'update.php?action=upload-plugin');
                $type = 'upload'; //Install plugin type, From Web or an Upload.
 
                $upgrader = new Plugin_Upgrader( new Plugin_Installer_Skin( compact('type', 'title', 'nonce', 'url') ) );
-               $upgrader->install( $file_upload->package );
+               $result = $upgrader->install( $file_upload->package );
+
+               if ( $result || is_wp_error($result) )
+                       $file_upload->cleanup();
 
                include(ABSPATH . 'wp-admin/admin-footer.php');
 
@@ -153,15 +152,15 @@ if ( isset($_GET['action']) ) {
 
                check_admin_referer('upgrade-theme_' . $theme);
 
-               add_thickbox();
-               wp_enqueue_script('theme-preview');
+               wp_enqueue_script( 'customize-loader' );
+
                $title = __('Update Theme');
                $parent_file = 'themes.php';
                $submenu_file = 'themes.php';
                require_once(ABSPATH . 'wp-admin/admin-header.php');
 
                $nonce = 'upgrade-theme_' . $theme;
-               $url = 'update.php?action=upgrade-theme&theme=' . $theme;
+               $url = 'update.php?action=upgrade-theme&theme=' . urlencode( $theme );
 
                $upgrader = new Theme_Upgrader( new Theme_Upgrader_Skin( compact('title', 'nonce', 'url', 'theme') ) );
                $upgrader->upgrade($theme);
@@ -195,18 +194,18 @@ if ( isset($_GET['action']) ) {
        } elseif ( 'install-theme' == $action ) {
 
                if ( ! current_user_can('install_themes') )
-                       wp_die(__('You do not have sufficient permissions to install themes for this site.'));
+                       wp_die( __( 'You do not have sufficient permissions to install themes on this site.' ) );
 
                include_once ABSPATH . 'wp-admin/includes/theme-install.php'; //for themes_api..
 
                check_admin_referer('install-theme_' . $theme);
-               $api = themes_api('theme_information', array('slug' => $theme, 'fields' => array('sections' => false) ) ); //Save on a bit of bandwidth.
+               $api = themes_api('theme_information', array('slug' => $theme, 'fields' => array('sections' => false, 'tags' => false) ) ); //Save on a bit of bandwidth.
 
                if ( is_wp_error($api) )
                        wp_die($api);
 
-               add_thickbox();
-               wp_enqueue_script('theme-preview');
+               wp_enqueue_script( 'customize-loader' );
+
                $title = __('Install Themes');
                $parent_file = 'themes.php';
                $submenu_file = 'themes.php';
@@ -214,7 +213,7 @@ if ( isset($_GET['action']) ) {
 
                $title = sprintf( __('Installing Theme: %s'), $api->name . ' ' . $api->version );
                $nonce = 'install-theme_' . $theme;
-               $url = 'update.php?action=install-theme&theme=' . $theme;
+               $url = 'update.php?action=install-theme&theme=' . urlencode( $theme );
                $type = 'web'; //Install theme type, From Web or an Upload.
 
                $upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact('title', 'url', 'nonce', 'plugin', 'api') ) );
@@ -225,26 +224,30 @@ if ( isset($_GET['action']) ) {
        } elseif ( 'upload-theme' == $action ) {
 
                if ( ! current_user_can('install_themes') )
-                       wp_die(__('You do not have sufficient permissions to install themes for this site.'));
+                       wp_die( __( 'You do not have sufficient permissions to install themes on this site.' ) );
 
                check_admin_referer('theme-upload');
 
                $file_upload = new File_Upload_Upgrader('themezip', 'package');
 
+               wp_enqueue_script( 'customize-loader' );
+
                $title = __('Upload Theme');
                $parent_file = 'themes.php';
                $submenu_file = 'theme-install.php';
-               add_thickbox();
-               wp_enqueue_script('theme-preview');
+
                require_once(ABSPATH . 'wp-admin/admin-header.php');
 
-               $title = sprintf( __('Installing Theme from uploaded file: %s'), basename( $file_upload->filename ) );
+               $title = sprintf( __('Installing Theme from uploaded file: %s'), esc_html( basename( $file_upload->filename ) ) );
                $nonce = 'theme-upload';
-               $url = add_query_arg(array('package' => $file_upload->filename), 'update.php?action=upload-theme');
+               $url = add_query_arg(array('package' => $file_upload->id), 'update.php?action=upload-theme');
                $type = 'upload'; //Install plugin type, From Web or an Upload.
 
                $upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact('type', 'title', 'nonce', 'url') ) );
-               $upgrader->install( $file_upload->package );
+               $result = $upgrader->install( $file_upload->package );
+
+               if ( $result || is_wp_error($result) )
+                       $file_upload->cleanup();
 
                include(ABSPATH . 'wp-admin/admin-footer.php');