WordPress 3.4

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

diff --git a/wp-admin/update.php b/wp-admin/update.php
index 71708d044b0a692ba0bbc69967afdf6ad0fc86e3..4fdf2064c79441181fb4580f1d04339562ce2a37 100644 (file)
--- a/wp-admin/update.php
+++ b/wp-admin/update.php
@@ -152,8 +152,8 @@ if ( isset($_GET['action']) ) {
 
                check_admin_referer('upgrade-theme_' . $theme);
 
 
                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';
                $title = __('Update Theme');
                $parent_file = 'themes.php';
                $submenu_file = 'themes.php';


@@ -199,13 +199,13 @@ if ( isset($_GET['action']) ) {
                include_once ABSPATH . 'wp-admin/includes/theme-install.php'; //for themes_api..
 
                check_admin_referer('install-theme_' . $theme);
                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);
 
 
                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';
                $title = __('Install Themes');
                $parent_file = 'themes.php';
                $submenu_file = 'themes.php';


@@ -230,11 +230,12 @@ if ( isset($_GET['action']) ) {
 
                $file_upload = new File_Upload_Upgrader('themezip', 'package');
 
 
                $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';
                $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 ) );
                require_once(ABSPATH . 'wp-admin/admin-header.php');
 
                $title = sprintf( __('Installing Theme from uploaded file: %s'), basename( $file_upload->filename ) );