WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add an `@see` mention for `Plugin_Upgrader`, plus spacing to the `wp_ajax_update_plugin()` delcaration. 

See #31888.

Built from https://develop.svn.wordpress.org/trunk@32006


git-svn-id: http://core.svn.wordpress.org/trunk@31985 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2015-04-04 14:19:27 +00:00
parent c477b2c966
commit 05fa6879ce
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/includes/ajax-actions.php
View File

@ -2881,6 +2881,8 @@ function wp_ajax_destroy_sessions() {
* AJAX handler for updating a plugin. * AJAX handler for updating a plugin.
* *
* @since 4.2.0 * @since 4.2.0
*
* @see Plugin_Upgrader
*/ */
function wp_ajax_update_plugin() { function wp_ajax_update_plugin() {
$plugin = urldecode( $_POST['plugin'] ); $plugin = urldecode( $_POST['plugin'] );
@ -2916,6 +2918,7 @@ function wp_ajax_update_plugin() {
if ( is_array( $result ) ) { if ( is_array( $result ) ) {
$plugin_update_data = current( $result ); $plugin_update_data = current( $result );
/* /*
* If the `update_plugins` site transient is empty (e.g. when you update * If the `update_plugins` site transient is empty (e.g. when you update
* two plugins in quick succession before the transient repopulates), * two plugins in quick succession before the transient repopulates),
@ -2927,10 +2930,13 @@ function wp_ajax_update_plugin() {
if ( $plugin_update_data === true ) { if ( $plugin_update_data === true ) {
wp_send_json_error( $status ); wp_send_json_error( $status );
} }
$plugin_data = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin ); $plugin_data = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin );
if ( $plugin_data['Version'] ) { if ( $plugin_data['Version'] ) {
$status['newVersion'] = sprintf( __( 'Version %s' ), $plugin_data['Version'] ); $status['newVersion'] = sprintf( __( 'Version %s' ), $plugin_data['Version'] );
} }
wp_send_json_success( $status ); wp_send_json_success( $status );
} else if ( is_wp_error( $result ) ) { } else if ( is_wp_error( $result ) ) {
$status['error'] = $result->get_error_message(); $status['error'] = $result->get_error_message();

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.2-beta4-32005'; $wp_version = '4.2-beta4-32006';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.