sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Fixes #35782.

git-svn-id: https://develop.svn.wordpress.org/trunk@36505 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dominik Schilling (ocean90) 2016-02-09 14:29:06 +00:00
parent 92a9a57b63
commit c7e84936c8
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/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>";
}
}
/**