X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/699231ae09f7057a4d0000cdf32e50a3df6a04ca..8f374b7233bc2815ccc387e448d208c5434eb961:/wp-admin/includes/update.php diff --git a/wp-admin/includes/update.php b/wp-admin/includes/update.php index 52e9ee1a..ff787167 100644 --- a/wp-admin/includes/update.php +++ b/wp-admin/includes/update.php @@ -26,7 +26,7 @@ function get_preferred_from_update_core() { * Get available core updates * * @param array $options Set $options['dismissed'] to true to show dismissed upgrades too, - * set $options['available'] to false to skip not-dimissed updates. + * set $options['available'] to false to skip not-dismissed updates. * @return array Array of the update objects */ function get_core_updates( $options = array() ) { @@ -82,9 +82,6 @@ function find_core_update( $version, $locale ) { } function core_update_footer( $msg = '' ) { - if ( is_multisite() && !current_user_can('update_core') ) - return false; - if ( !current_user_can('update_core') ) return sprintf( __( 'Version %s' ), $GLOBALS['wp_version'] ); @@ -100,11 +97,11 @@ function core_update_footer( $msg = '' ) { switch ( $cur->response ) { case 'development' : - return sprintf( __( 'You are using a development version (%1$s). Cool! Please stay updated.' ), $GLOBALS['wp_version'], 'update-core.php'); + return sprintf( __( 'You are using a development version (%1$s). Cool! Please stay updated.' ), $GLOBALS['wp_version'], network_admin_url( 'update-core.php' ) ); break; case 'upgrade' : - return sprintf( ''.__( 'Get Version %2$s' ).'', 'update-core.php', $cur->current); + return sprintf( ''.__( 'Get Version %2$s' ).'', network_admin_url( 'update-core.php' ), $cur->current); break; case 'latest' : @@ -129,25 +126,25 @@ function update_nag() { if ( ! isset( $cur->response ) || $cur->response != 'upgrade' ) return false; - if ( current_user_can('update_core') ) - $msg = sprintf( __('WordPress %1$s is available! Please update now.'), $cur->current, 'update-core.php' ); - else + if ( current_user_can('update_core') ) { + $msg = sprintf( __('WordPress %1$s is available! Please update now.'), $cur->current, network_admin_url( 'update-core.php' ) ); + } else { $msg = sprintf( __('WordPress %1$s is available! Please notify the site administrator.'), $cur->current ); - + } echo "