WordPress 4.1-scripts

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

diff --git a/wp-admin/update.php b/wp-admin/update.php
index 4fdf2064c79441181fb4580f1d04339562ce2a37..6ded7a7d7a7c39a49d6311d89f49917ffe9a629d 100644 (file)
--- a/wp-admin/update.php
+++ b/wp-admin/update.php
@@ -10,9 +10,9 @@ 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';
+include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
 
 if ( isset($_GET['action']) ) {
        $plugin = isset($_REQUEST['plugin']) ? trim($_REQUEST['plugin']) : '';
@@ -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,10 +54,12 @@ 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;
-               $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 +72,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 );
@@ -84,15 +86,16 @@ 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 ) {
 
                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..
+               include_once( ABSPATH . 'wp-admin/includes/plugin-install.php' ); //for plugins_api..
 
                check_admin_referer('install-plugin_' . $plugin);
                $api = plugins_api('plugin_information', array('slug' => $plugin, 'fields' => array('sections' => false) ) ); //Save on a bit of bandwidth.
@@ -107,7 +110,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']));
 
@@ -120,8 +123,9 @@ 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.'));
+               if ( ! current_user_can( 'upload_plugins' ) ) {
+                       wp_die( __( 'You do not have sufficient permissions to install plugins on this site.' ) );
+               }
 
                check_admin_referer('plugin-upload');
 
@@ -132,7 +136,7 @@ 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->id), 'update.php?action=upload-plugin');
                $type = 'upload'; //Install plugin type, From Web or an Upload.
@@ -153,6 +157,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';
@@ -160,7 +165,7 @@ if ( isset($_GET['action']) ) {
                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);
@@ -184,7 +189,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' ) ) );
@@ -194,11 +199,11 @@ 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..
+               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) )
@@ -213,7 +218,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') ) );
@@ -223,8 +228,9 @@ 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.'));
+               if ( ! current_user_can( 'upload_themes' ) ) {
+                       wp_die( __( 'You do not have sufficient permissions to install themes on this site.' ) );
+               }
 
                check_admin_referer('theme-upload');
 
@@ -238,7 +244,7 @@ if ( isset($_GET['action']) ) {
 
                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->id), 'update.php?action=upload-theme');
                $type = 'upload'; //Install plugin type, From Web or an Upload.
@@ -252,6 +258,15 @@ if ( isset($_GET['action']) ) {
                include(ABSPATH . 'wp-admin/admin-footer.php');
 
        } else {
-               do_action('update-custom_' . $action);
+               /**
+                * Fires when a custom plugin or theme update request is received.
+                *
+                * The dynamic portion of the hook name, `$action`, refers to the action
+                * provided in the request for wp-admin/update.php. Can be used to
+                * provide custom update functionality for themes and plugins.
+                *
+                * @since 2.8.0
+                */
+               do_action( "update-custom_{$action}" );
        }
 }