Changeset 1481

Show
Ignore:
Timestamp:
09/19/08 13:05:29 (2 months ago)
Author:
donncha
Message:

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.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/2.6/wp-admin/includes/mu.php

    r1467 r1481  
    695695add_action( 'wp_dashboard_setup', 'mu_dashboard' ); 
    696696 
    697 /* Unused update message called from Dashboard */ 
    698 function update_right_now_message() { 
    699 } 
    700  
    701697function profile_update_primary_blog() { 
    702698        global $current_user; 

  • branches/2.6/wp-admin/includes/update.php

    r1374 r1481  
    11<?php 
    2 /* 
    32 
    43// The admin side of our 1.1 update system 
    54 
    65function core_update_footer( $msg = '' ) { 
     6        if( !is_site_admin() ) 
     7                return false; 
    78        if ( !current_user_can('manage_options') ) 
    89                return sprintf( '| '.__( 'Version %s' ), $GLOBALS['wp_version'] ); 
    910 
    10         $cur = get_option( 'update_core' ); 
     11        $cur = get_site_option( 'update_core' ); 
    1112 
    1213        switch ( $cur->response ) { 
    …… 
    3031 
    3132function update_nag() { 
    32         $cur = get_option( 'update_core' ); 
     33        if( !is_site_admin() ) 
     34                return false; 
     35        $cur = get_site_option( 'update_core' ); 
    3336 
    3437        if ( ! isset( $cur->response ) || $cur->response != 'upgrade' ) 
    …… 
    4649// Called directly from dashboard 
    4750function update_right_now_message() { 
    48         $cur = get_option( 'update_core' ); 
     51        if( !is_site_admin() ) 
     52                return false; 
     53        $cur = get_site_option( 'update_core' ); 
    4954 
    5055        $msg = sprintf( __('This is WordPress version %s.'), $GLOBALS['wp_version'] ); 
    …… 
    5459        echo "<span id='wp-version-message'>$msg</span>"; 
    5560} 
    56 */ 
    5761 
    5862function wp_plugin_update_row( $file, $plugin_data ) { 

  • branches/2.6/wp-includes/update.php

    r1476 r1481  
    2323                return; 
    2424 
    25         global $wp_version, $current_site; 
     25        global $wp_version, $wpmu_version, $current_site; 
    2626        $php_version = phpversion(); 
    2727 
    28         $current = get_option( 'update_core' ); 
     28        $current = get_site_option( 'update_core' ); 
    2929        $locale = get_locale(); 
    3030 
    …… 
    3232                isset( $current->last_checked ) && 
    3333                43200 > ( time() - $current->last_checked ) && 
    34                 $current->version_checked == $wp_version 
     34                $current->version_checked == $wpmu_version 
    3535        ) 
    3636                return false; 
    …… 
    3838        $new_option = ''; 
    3939        $new_option->last_checked = time(); // this gets set whether we get a response or not, so if something is down or misconfigured it won't delay the page load for more than 3 seconds, twice a day 
    40         $new_option->version_checked = $wp_version; 
     40        $new_option->version_checked = $wpmu_version; 
    4141 
    42         $http_request  = "GET /core/version-check/1.1/?version=$wp_version&php=$php_version&locale=$locale HTTP/1.0\r\n"; 
     42        $http_request  = "GET /core/version-check/1.1/?version=$wp_version&wpmuversion=$wpmu_version&php=$php_version&locale=$locale&blogs=" . get_blog_count() . " HTTP/1.0\r\n"; 
    4343        $http_request .= "Host: api.wordpress.org\r\n"; 
    4444        $http_request .= 'Content-Type: application/x-www-form-urlencoded; charset=' . get_option('blog_charset') . "\r\n"; 
    45         $http_request .= 'User-Agent: WordPress MU/' . $wpmu_version . '; ' . get_bloginfo('url') . '; http://' . $current_site->domain . $current_site->path . "\r\n"; 
     45        $http_request .= 'User-Agent: WordPress MU/' . $wpmu_version . '; ' . apply_filters( 'currentsite_on_version_check', 'http://' . $current_site->domain . $current_site->path ) . "\r\n"; 
    4646        $http_request .= "\r\n"; 
    4747 
    …… 
    6464                $new_option->response = attribute_escape( $returns[0] ); 
    6565                if ( isset( $returns[1] ) ) 
    66                         $new_option->url = clean_url( $returns[1] ); 
     66                        $new_option->url = 'http://mu.wordpress.org/'; 
    6767                if ( isset( $returns[2] ) ) 
    6868                        $new_option->current = attribute_escape( $returns[2] ); 
    6969        } 
    70         update_option( 'update_core', $new_option ); 
     70        update_site_option( 'update_core', $new_option ); 
    7171} 
    7272add_action( 'init', 'wp_version_check' );