WordPress.org

Plugin Directory

Changeset 595076


Ignore:
Timestamp:
09/05/12 18:13:04 (20 months ago)
Author:
andy
Message:

jetpack multiuser: merge trunk

Location:
jetpack/branches/multiuser/modules
Files:
3 edited
1 copied

Legend:

Unmodified
Added
Removed
  • jetpack/branches/multiuser/modules/custom-css/custom-css.php

    r589424 r595076  
    230230        do_action( 'safecss_save_pre' ); 
    231231 
     232        $warnings = array(); 
     233 
    232234        safecss_class(); 
    233235        $csstidy = new csstidy(); 
     
    386388        return; 
    387389 
    388     if ( ! is_super_admin() && ( 1 == $current_blog->spam || 1 == $current_blog->deleted ) ) 
     390    if ( ! is_super_admin() && isset( $current_blog ) && ( 1 == $current_blog->spam || 1 == $current_blog->deleted ) ) 
    389391        return; 
    390392 
  • jetpack/branches/multiuser/modules/sharedaddy/sharedaddy.php

    r588821 r595076  
    2828 
    2929function sharing_meta_box_content( $post ) { 
    30     $sharing_checked = get_post_meta( $post->ID, 'sharing_disabled', false ); 
     30    $disabled = get_post_meta( $post_id, 'sharing_disabled', true ); ?> 
    3131 
    32     if ( empty( $sharing_checked ) || $sharing_checked === false ) 
    33         $sharing_checked = ' checked="checked"'; 
    34     else 
    35         $sharing_checked = ''; 
     32    <p> 
     33        <label for="enable_post_sharing"> 
     34            <input type="checkbox" name="enable_post_sharing" id="enable_post_sharing" value="1" <?php checked( !$disabled ); ?>> 
     35            <?php _e( 'Show sharing buttons.' ); ?> 
     36        </label> 
     37        <input type="hidden" name="sharing_status_hidden" value="1" /> 
     38    </p> 
    3639 
    37     echo '<p><label for="enable_post_sharing"><input name="enable_post_sharing" id="enable_post_sharing" value="1"' . $sharing_checked . ' type="checkbox"> ' . __( 'Show sharing buttons on this post.', 'jetpack' ) . '</label><input type="hidden" name="sharing_status_hidden" value="1" /></p>'; 
     40    <?php 
     41 
    3842} 
    3943 
  • jetpack/branches/multiuser/modules/sharedaddy/sharing-sources.php

    r592441 r595076  
    698698            $widths = array( 
    699699                'bg_BG' => 120, 
    700                 'de_DE' => 100, 
     700                'de_DE' => 120, 
    701701                'da_DK' => 120, 
    702702                'es_ES' => 110, 
Note: See TracChangeset for help on using the changeset viewer.