WordPress 3.9.2-scripts

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

diff --git a/wp-admin/update.php b/wp-admin/update.php
index 4290e58d78a90eebedc174cbb8629a976dd69cb2..fc8657446939ff9c44ce886cb3ce5385b4036e38 100644 (file)
--- a/wp-admin/update.php
+++ b/wp-admin/update.php
@@ -37,7 +37,7 @@ if ( isset($_GET['action']) ) {
                $url = 'update.php?action=update-selected&plugins=' . urlencode(implode(',', $plugins));
                $nonce = 'bulk-update-plugins';
 
-               wp_enqueue_script('jquery');
+               wp_enqueue_script( 'updates' );
                iframe_header();
 
                $upgrader = new Plugin_Upgrader( new Bulk_Plugin_Upgrader_Skin( compact( 'nonce', 'url' ) ) );
@@ -54,6 +54,8 @@ if ( isset($_GET['action']) ) {
                $title = __('Update Plugin');
                $parent_file = 'plugins.php';
                $submenu_file = 'plugins.php';
+
+               wp_enqueue_script( 'updates' );
                require_once(ABSPATH . 'wp-admin/admin-header.php');
 
                $nonce = 'upgrade-plugin_' . $plugin;
@@ -84,7 +86,8 @@ if ( isset($_GET['action']) ) {
 
                        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);
+                       wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
+                       include( WP_PLUGIN_DIR . '/' . $plugin );
                }
                iframe_footer();
        } elseif ( 'install-plugin' == $action ) {
@@ -153,6 +156,7 @@ if ( isset($_GET['action']) ) {
                check_admin_referer('upgrade-theme_' . $theme);
 
                wp_enqueue_script( 'customize-loader' );
+               wp_enqueue_script( 'updates' );
 
                $title = __('Update Theme');
                $parent_file = 'themes.php';
@@ -184,7 +188,7 @@ if ( isset($_GET['action']) ) {
                $url = 'update.php?action=update-selected-themes&themes=' . urlencode(implode(',', $themes));
                $nonce = 'bulk-update-themes';
 
-               wp_enqueue_script('jquery');
+               wp_enqueue_script( 'updates' );
                iframe_header();
 
                $upgrader = new Theme_Upgrader( new Bulk_Theme_Upgrader_Skin( compact( 'nonce', 'url' ) ) );
@@ -198,7 +202,7 @@ if ( isset($_GET['action']) ) {
 
                include_once ABSPATH . 'wp-admin/includes/theme-install.php'; //for themes_api..
 
-               check_admin_referer('install-theme_' . $theme);
+               check_admin_referer( 'install-theme_' . $theme );
                $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) )