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

Revert [30696] pending further investigation. 

See #31011, #13071

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


git-svn-id: http://core.svn.wordpress.org/trunk@31371 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2015-02-09 21:50:29 +00:00
parent c99149419d
commit 93fced2d15
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/update.php
View File

@ -521,14 +521,12 @@ function wp_get_update_data() {
$counts = array( 'plugins' => 0, 'themes' => 0, 'wordpress' => 0, 'translations' => 0 ); $counts = array( 'plugins' => 0, 'themes' => 0, 'wordpress' => 0, 'translations' => 0 );
if ( $plugins = current_user_can( 'update_plugins' ) ) { if ( $plugins = current_user_can( 'update_plugins' ) ) {
wp_update_plugins(); // Check for Plugin updates
$update_plugins = get_site_transient( 'update_plugins' ); $update_plugins = get_site_transient( 'update_plugins' );
if ( ! empty( $update_plugins->response ) ) if ( ! empty( $update_plugins->response ) )
$counts['plugins'] = count( $update_plugins->response ); $counts['plugins'] = count( $update_plugins->response );
} }
if ( $themes = current_user_can( 'update_themes' ) ) { if ( $themes = current_user_can( 'update_themes' ) ) {
wp_update_themes(); // Check for Theme updates
$update_themes = get_site_transient( 'update_themes' ); $update_themes = get_site_transient( 'update_themes' );
if ( ! empty( $update_themes->response ) ) if ( ! empty( $update_themes->response ) )
$counts['themes'] = count( $update_themes->response ); $counts['themes'] = count( $update_themes->response );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.2-alpha-31389'; $wp_version = '4.2-alpha-31390';
/** /**
* 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.