diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-09-19 13:05:29 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-09-19 13:05:29 +0000 |
| commit | fceaa31bd8c35850ef9ab42c612e6c39a500c71c (patch) | |
| tree | dc80d714618991f9a96eefa6a9fab659cc82ce3e /wp-admin | |
| parent | 97133b20063404913537feb138e31bcabec590e5 (diff) | |
| download | wordpress-mu-fceaa31bd8c35850ef9ab42c612e6c39a500c71c.tar.gz wordpress-mu-fceaa31bd8c35850ef9ab42c612e6c39a500c71c.tar.xz wordpress-mu-fceaa31bd8c35850ef9ab42c612e6c39a500c71c.zip | |
Add mu version blog count to update request.
Add current_site details to User Agent with "currentsite_on_version_check" filter.
Store current version details in a site option.
Only show update messages to site admins.
git-svn-id: http://svn.automattic.com/wordpress-mu/branches/2.6@1481 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin')
| -rw-r--r-- | wp-admin/includes/mu.php | 4 | ||||
| -rw-r--r-- | wp-admin/includes/update.php | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/wp-admin/includes/mu.php b/wp-admin/includes/mu.php index 648f9bb..9db85a3 100644 --- a/wp-admin/includes/mu.php +++ b/wp-admin/includes/mu.php @@ -694,10 +694,6 @@ function mu_dashboard() { } add_action( 'wp_dashboard_setup', 'mu_dashboard' ); -/* Unused update message called from Dashboard */ -function update_right_now_message() { -} - function profile_update_primary_blog() { global $current_user; diff --git a/wp-admin/includes/update.php b/wp-admin/includes/update.php index 5cc83f7..ddfc10c 100644 --- a/wp-admin/includes/update.php +++ b/wp-admin/includes/update.php @@ -1,13 +1,14 @@ <?php -/* // The admin side of our 1.1 update system function core_update_footer( $msg = '' ) { + if( !is_site_admin() ) + return false; if ( !current_user_can('manage_options') ) return sprintf( '| '.__( 'Version %s' ), $GLOBALS['wp_version'] ); - $cur = get_option( 'update_core' ); + $cur = get_site_option( 'update_core' ); switch ( $cur->response ) { case 'development' : @@ -29,7 +30,9 @@ function core_update_footer( $msg = '' ) { add_filter( 'update_footer', 'core_update_footer' ); function update_nag() { - $cur = get_option( 'update_core' ); + if( !is_site_admin() ) + return false; + $cur = get_site_option( 'update_core' ); if ( ! isset( $cur->response ) || $cur->response != 'upgrade' ) return false; @@ -45,7 +48,9 @@ add_action( 'admin_notices', 'update_nag', 3 ); // Called directly from dashboard function update_right_now_message() { - $cur = get_option( 'update_core' ); + if( !is_site_admin() ) + return false; + $cur = get_site_option( 'update_core' ); $msg = sprintf( __('This is WordPress version %s.'), $GLOBALS['wp_version'] ); if ( isset( $cur->response ) && $cur->response == 'upgrade' && current_user_can('manage_options') ) @@ -53,7 +58,6 @@ function update_right_now_message() { echo "<span id='wp-version-message'>$msg</span>"; } -*/ function wp_plugin_update_row( $file, $plugin_data ) { if( !is_site_admin() ) |