diff -r f507feede89a -r 09a1c134465b web/wp-admin/includes/update.php --- a/web/wp-admin/includes/update.php Wed Dec 19 12:35:13 2012 -0800 +++ b/web/wp-admin/includes/update.php Wed Dec 19 17:46:52 2012 -0800 @@ -83,9 +83,12 @@ function core_update_footer( $msg = '' ) { if ( !current_user_can('update_core') ) - return sprintf( __( 'Version %s' ), $GLOBALS['wp_version'] ); + return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) ); $cur = get_preferred_from_update_core(); + if ( ! is_object( $cur ) ) + $cur = new stdClass; + if ( ! isset( $cur->current ) ) $cur->current = ''; @@ -97,7 +100,7 @@ switch ( $cur->response ) { case 'development' : - return sprintf( __( 'You are using a development version (%1$s). Cool! Please stay updated.' ), $GLOBALS['wp_version'], network_admin_url( 'update-core.php' ) ); + return sprintf( __( 'You are using a development version (%1$s). Cool! Please stay updated.' ), get_bloginfo( 'version', 'display' ), network_admin_url( 'update-core.php' ) ); break; case 'upgrade' : @@ -106,7 +109,7 @@ case 'latest' : default : - return sprintf( __( 'Version %s' ), $GLOBALS['wp_version'] ); + return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) ); break; } } @@ -134,10 +137,11 @@ echo "
$msg
"; } add_action( 'admin_notices', 'update_nag', 3 ); +add_action( 'network_admin_notices', 'update_nag', 3 ); // Called directly from dashboard function update_right_now_message() { - $msg = sprintf( __('You are using WordPress %s.'), $GLOBALS['wp_version'] ); + $msg = sprintf( __( 'You are using WordPress %s.' ), get_bloginfo( 'version', 'display' ) ); if ( current_user_can('update_core') ) { $cur = get_preferred_from_update_core();