WordPress.org

Plugin Directory


Ignore:
Location:
akismet/tags/2.5.2
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • akismet/tags/2.5.2/admin.php

    • Property svn:mergeinfo set to (toggle deleted branches)
      /akismet/branches/2.2/admin.php245899-245919
      /akismet/branches/sprint-2.4/admin.php267929-278574
      /akismet/trunk/admin.php287838-293033
    r895766 r895766  
    237237<script type="text/javascript"> 
    238238function resizeIframe() { 
    239     var height = document.documentElement.clientHeight; 
    240     height -= document.getElementById('akismet-stats-frame').offsetTop; 
    241     height += 100; // magic padding 
    242      
    243     document.getElementById('akismet-stats-frame').style.height = height +"px"; 
     239   
     240    document.getElementById('akismet-stats-frame').style.height = "2500px"; 
    244241     
    245242}; 
     
    353350         
    354351    if ( apply_filters( 'akismet_show_user_comments_approved', get_option('akismet_show_user_comments_approved') ) == 'true' ) { 
    355         $comment_count = akimset_get_user_comments_approved( $comment->user_id, $comment->comment_author_email, $comment->comment_author, $comment->comment_author_url ); 
    356         echo '<span class="akismet-user-comment-count" commentid="'.$comment->comment_ID.'" style="display:none;"><br><span class="akismet-user-comment-counts">'.sprintf( _n( '%s approved', '%s approved', $comment_count ), intval($comment_count) ).'</span></span>'; 
     352        $comment_count = akismet_get_user_comments_approved( $comment->user_id, $comment->comment_author_email, $comment->comment_author, $comment->comment_author_url ); 
     353        $comment_count = intval( $comment_count ); 
     354        echo '<span class="akismet-user-comment-count" commentid="'.$comment->comment_ID.'" style="display:none;"><br><span class="akismet-user-comment-counts">'.sprintf( _n( '%s approved', '%s approved', $comment_count ), number_format_i18n( $comment_count ) ) . '</span></span>'; 
    357355    } 
    358356     
     
    431429    global $submenu, $wp_db_version; 
    432430 
    433     $plural_func = '__ngettext'; 
    434     if ( function_exists( '_n' ) ) 
    435         $plural_func = '_n'; 
    436  
    437431    // clean_url was deprecated in WP 3.0 
    438432    $esc_url = 'clean_url'; 
     
    448442 
    449443    if ( $count = get_option('akismet_spam_count') ) { 
    450         $intro = sprintf( $plural_func( 
     444        $intro = sprintf( _n( 
    451445            '<a href="%1$s">Akismet</a> has protected your site from %2$s spam comment already. ', 
    452446            '<a href="%1$s">Akismet</a> has protected your site from %2$s spam comments already. ', 
     
    458452 
    459453    if ( $queue_count = akismet_spam_count() ) { 
    460         $queue_text = sprintf( $plural_func( 
     454        $queue_text = sprintf( _n( 
    461455            'There\'s <a href="%2$s">%1$s comment</a> in your spam queue right now.', 
    462456            'There are <a href="%2$s">%1$s comments</a> in your spam queue right now.', 
  • akismet/tags/2.5.2/akismet.css

    r895766 r895766  
    11#submitted-on { position: relative; } 
    2 #the-comment-list .author { padding-bottom: 5px !important; white-space: nowrap; } 
    3 #the-comment-list .author a { padding-left: 42px !important; } 
    4 #the-comment-list .author img { position: absolute; top: 0; left: 0; } 
    5 #the-comment-list .author strong { padding-left: 42px; font-size: 12px; position: relative; } 
    62#the-comment-list .author .akismet-user-comment-count { display: inline; } 
    7 #the-comment-list .author .akismet-user-comment-counts { padding-left: 42px; } 
    83#dashboard_recent_comments .akismet-status { display: none; } /* never show the flagged by text on the dashboard */ 
    94.akismet-status { float: right; } 
  • akismet/tags/2.5.2/akismet.php

    r895766 r895766  
    77Plugin URI: http://akismet.com/ 
    88Description: Used by millions, Akismet is quite possibly the best way in the world to <strong>protect your blog from comment and track-back spam</strong>. It keeps your site protected from spam even while you sleep. To get started: 1) Click the "Activate" link to the left of this description, 2) <a href="http://akismet.com/get/?return=true">Sign up for an Akismet API key</a>, and 3) Go to your <a href="plugins.php?page=akismet-key-config">Akismet configuration</a> page, and save your API key. 
    9 Version: 2.5.1 
     9Version: 2.5.2 
    1010Author: Automattic 
    1111Author URI: http://automattic.com/wordpress-plugins/ 
     
    2929*/ 
    3030 
    31 define('AKISMET_VERSION', '2.5.0'); 
     31define('AKISMET_VERSION', '2.5.2'); 
    3232define('AKISMET_PLUGIN_URL', plugin_dir_url( __FILE__ )); 
    3333 
     
    101101            $roles = join(',', $comment_user->roles); 
    102102    } 
    103      
     103 
     104    if ( is_multisite() && is_super_admin( $user_id ) ) { 
     105        if ( empty( $roles ) ) { 
     106            $roles = 'super_admin'; 
     107        } else { 
     108            $comment_user->roles[] = 'super_admin'; 
     109            $roles = join( ',', $comment_user->roles ); 
     110        } 
     111    } 
     112 
    104113    return $roles; 
    105114} 
     
    133142                'User-Agent'    => $akismet_ua 
    134143            ), 
    135             'httpversion'   => '1.0' 
     144            'httpversion'   => '1.0', 
     145            'timeout'       => 15 
    136146        ); 
    137147        $akismet_url = "http://{$http_host}{$path}"; 
     
    180190 
    181191// how many approved comments does this author have? 
    182 function akimset_get_user_comments_approved( $user_id, $comment_author_email, $comment_author, $comment_author_url ) { 
     192function akismet_get_user_comments_approved( $user_id, $comment_author_email, $comment_author, $comment_author_url ) { 
    183193    global $wpdb; 
    184194     
  • akismet/tags/2.5.2/readme.txt

    r895766 r895766  
    44Requires at least: 3.0 
    55Tested up to: 3.1 
    6 Stable tag: 2.5.1 
     6Stable tag: 2.5.2 
    77License: GPLv2 
    88 
     
    3131 
    3232== Changelog == 
     33 
     34= 2.5.2 = 
     35 
     36* Properly format the comment count for author counts 
     37* Look for super admins on multisite installs when looking up user roles 
     38* Increase the HTTP request timeout 
     39* Removed padding for author approved count 
     40* Fix typo in function name 
     41* Set Akismet stats iframe height to fixed 2500px.  Better to have one tall scroll bar than two side by side. 
    3342 
    3443= 2.5.1 = 
Note: See TracChangeset for help on using the changeset viewer.