Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-31 21:48:36 +01:00
Code Issues Projects Releases Wiki Activity

Multisite: Don't show the database upgrade admin notice on the upgrade page itself.

Browse Source 
Fixes #35782.
Built from https://develop.svn.wordpress.org/trunk@36505


git-svn-id: http://core.svn.wordpress.org/trunk@36472 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2016-02-09 14:30:28 +00:00
parent d9a5894c2e
commit cbe5fc6fb8
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
wp-admin/includes/ms.php
View File

@ -748,16 +748,25 @@ function mu_dropdown_languages( $lang_files = array(), $current = '' ) {
*
* @since 3.0.0
*
* @global int $wp_db_version The version number of the database.
* @global int $wp_db_version The version number of the database.
* @global string $pagenow
*
* @return false False if the current user is not a super admin.
*/
function site_admin_notice() {
global $wp_db_version;
if ( !is_super_admin() )
global $wp_db_version, $pagenow;
if ( ! is_super_admin() ) {
return false;
if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version )
}
if ( 'upgrade.php' == $pagenow ) {
return;
}
if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version ) {
echo "<div class='update-nag'>" . sprintf( __( 'Thank you for Updating! Please visit the <a href="%s">Upgrade Network</a> page to update all your sites.' ), esc_url( network_admin_url( 'upgrade.php' ) ) ) . "</div>";
}
}
/**

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.5-alpha-36504';
$wp_version = '4.5-alpha-36505';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.