WordPress.org

Plugin Directory

Changeset 618623


Ignore:
Timestamp:
10/29/12 13:11:58 (18 months ago)
Author:
jblz
Message:

Jetpack: Merge changes from 1.9 branch to trunk.
Changesets: [618443] [618445] [618614]

File:
1 edited

Legend:

Unmodified
Added
Removed
  • jetpack/trunk/modules/notes.php

    r617154 r618623  
    77 */ 
    88 
    9 if ( !defined( 'JETPACK_NOTES__CACHE_BUSTER' ) ) define( 'JETPACK_NOTES__CACHE_BUSTER', gmdate( 'oW' ) ); 
     9if ( !defined( 'JETPACK_NOTES__CACHE_BUSTER' ) ) define( 'JETPACK_NOTES__CACHE_BUSTER', JETPACK__VERSION . '-' . gmdate( 'oW' ) ); 
    1010 
    1111class Jetpack_Notifications { 
     
    6666        $i = hexdec( substr( md5( $file ), -1 ) ) % 2; 
    6767        $http = is_ssl() ? 'https' : 'http'; 
    68         $url = $http . '://s' . $i . '.wordpress.com' . $file; 
     68        $url = $http . '://s' . $i . '.wp.com' . $file; 
    6969        return $url; 
    7070    } 
    7171 
    7272    function action_init() { 
    73         if ( !is_user_logged_in() ) 
     73        if ( !has_filter( 'show_admin_bar', '__return_true' ) && !is_user_logged_in() ) 
    7474            return; 
    7575        wp_enqueue_style( 'notes-admin-bar-rest', $this->wpcom_static_url( '/wp-content/mu-plugins/notes/admin-bar-rest.css' ), array(), JETPACK_NOTES__CACHE_BUSTER ); 
Note: See TracChangeset for help on using the changeset viewer.