Akismet Anti-Spam - Version 2.3.0

Version Description

Download this release

Release Info

Developer tellyworth
Plugin Icon 128x128 Akismet Anti-Spam
Version 2.3.0
Comparing to
See all releases

Code changes from version 2.2.9 to 2.3.0

Files changed (2) hide show
  1. akismet.php +12 -12
  2. readme.txt +8 -3
akismet.php CHANGED
@@ -2,13 +2,13 @@
2
  /*
3
  Plugin Name: Akismet
4
  Plugin URI: http://akismet.com/
5
- Description: Akismet checks your comments against the Akismet web service to see if they look like spam or not. You need a <a href="http://akismet.com/get/">WordPress.com API key</a> to use it. You can review the spam it catches under "Comments." To show off your Akismet stats just put <code>&lt;?php akismet_counter(); ?&gt;</code> in your template. See also: <a href="http://wordpress.org/extend/plugins/stats/">WP Stats plugin</a>.
6
- Version: 2.2.9
7
- Author: Matt Mullenweg
8
- Author URI: http://ma.tt/
9
  */
10
 
11
- define('AKISMET_VERSION', '2.2.9');
12
 
13
  // If you hardcode a WP.com API key here, all key config screens will be hidden
14
  if ( defined('WPCOM_API_KEY') )
@@ -134,19 +134,19 @@ function akismet_conf() {
134
  <div class="narrow">
135
  <form action="" method="post" id="akismet-conf" style="margin: auto; width: 400px; ">
136
  <?php if ( !$wpcom_api_key ) { ?>
137
- <p><?php printf(__('For many people, <a href="%1$s">Akismet</a> will greatly reduce or even completely eliminate the comment and trackback spam you get on your site. If one does happen to get through, simply mark it as "spam" on the moderation screen and Akismet will learn from the mistakes. If you don\'t have a WordPress.com account yet, you can get one at <a href="%2$s">Akismet.com</a>.'), 'http://akismet.com/', 'http://akismet.com/get/'); ?></p>
138
 
139
- <?php akismet_nonce_field($akismet_nonce) ?>
140
- <h3><label for="key"><?php _e('WordPress.com API Key'); ?></label></h3>
141
  <?php foreach ( $ms as $m ) : ?>
142
  <p style="padding: .5em; background-color: #<?php echo $messages[$m]['color']; ?>; color: #fff; font-weight: bold;"><?php echo $messages[$m]['text']; ?></p>
143
  <?php endforeach; ?>
144
- <p><input id="key" name="key" type="text" size="15" maxlength="12" value="<?php echo get_option('wordpress_api_key'); ?>" style="font-family: 'Courier New', Courier, mono; font-size: 1.5em;" /> (<?php _e('<a href="http://faq.wordpress.com/2005/10/19/api-key/">What is this?</a>'); ?>)</p>
145
  <?php if ( $invalid_key ) { ?>
146
  <h3><?php _e('Why might my key be invalid?'); ?></h3>
147
  <p><?php _e('This can mean one of two things, either you copied the key wrong or that the plugin is unable to reach the Akismet servers, which is most often caused by an issue with your web host around firewalls or similar.'); ?></p>
148
  <?php } ?>
149
  <?php } ?>
 
150
  <p><label><input name="akismet_discard_month" id="akismet_discard_month" value="true" type="checkbox" <?php if ( get_option('akismet_discard_month') == 'true' ) echo ' checked="checked" '; ?> /> <?php _e('Automatically discard spam comments on posts older than a month.'); ?></label></p>
151
  <p class="submit"><input type="submit" name="submit" value="<?php _e('Update options &raquo;'); ?>" /></p>
152
  </form>
@@ -330,7 +330,7 @@ function akismet_admin_warnings() {
330
  if ( !get_option('wordpress_api_key') && !$wpcom_api_key && !isset($_POST['submit']) ) {
331
  function akismet_warning() {
332
  echo "
333
- <div id='akismet-warning' class='updated fade'><p><strong>".__('Akismet is almost ready.')."</strong> ".sprintf(__('You must <a href="%1$s">enter your WordPress.com API key</a> for it to work.'), "plugins.php?page=akismet-key-config")."</p></div>
334
  ";
335
  }
336
  add_action('admin_notices', 'akismet_warning');
@@ -1107,7 +1107,7 @@ function widget_akismet_register() {
1107
  ?>
1108
  <?php echo $before_widget; ?>
1109
  <?php echo $before_title . $options['title'] . $after_title; ?>
1110
- <div id="akismetwrap"><div id="akismetstats"><a id="aka" href="http://akismet.com" title=""><?php printf( __( '%1$s %2$sspam comments%3$s %4$sblocked by%5$s<br />%6$sAkismet%7$s' ), '<div id="akismet1"><span id="akismetcount">' . $count . '</span>', '<span id="akismetsc">', '</span></div>', '<div id="akismet2"><span id="akismetbb">', '</span>', '<span id="akismeta">', '</span></div>' ); ?></a></div></div>
1111
  <?php echo $after_widget; ?>
1112
  <?php
1113
  }
@@ -1131,7 +1131,7 @@ function widget_akismet_register() {
1131
  $options = $newoptions = get_option('widget_akismet');
1132
  if ( $_POST["akismet-submit"] ) {
1133
  $newoptions['title'] = strip_tags(stripslashes($_POST["akismet-title"]));
1134
- if ( empty($newoptions['title']) ) $newoptions['title'] = 'Spam Blocked';
1135
  }
1136
  if ( $options != $newoptions ) {
1137
  $options = $newoptions;
2
  /*
3
  Plugin Name: Akismet
4
  Plugin URI: http://akismet.com/
5
+ Description: Akismet checks your comments against the Akismet web service to see if they look like spam or not. You need an <a href="http://akismet.com/get/">API key</a> to use it. You can review the spam it catches under "Comments." To show off your Akismet stats just put <code>&lt;?php akismet_counter(); ?&gt;</code> in your template. See also: <a href="http://wordpress.org/extend/plugins/stats/">WP Stats plugin</a>.
6
+ Version: 2.3.0
7
+ Author: Automattic
8
+ Author URI: http://automattic.com/wordpress-plugins/
9
  */
10
 
11
+ define('AKISMET_VERSION', '2.3.0');
12
 
13
  // If you hardcode a WP.com API key here, all key config screens will be hidden
14
  if ( defined('WPCOM_API_KEY') )
134
  <div class="narrow">
135
  <form action="" method="post" id="akismet-conf" style="margin: auto; width: 400px; ">
136
  <?php if ( !$wpcom_api_key ) { ?>
137
+ <p><?php printf(__('For many people, <a href="%1$s">Akismet</a> will greatly reduce or even completely eliminate the comment and trackback spam you get on your site. If one does happen to get through, simply mark it as "spam" on the moderation screen and Akismet will learn from the mistakes. If you don\'t have an API key yet, you can get one at <a href="%2$s">Akismet.com</a>.'), 'http://akismet.com/', 'http://akismet.com/get/'); ?></p>
138
 
139
+ <h3><label for="key"><?php _e('Akismet API Key'); ?></label></h3>
 
140
  <?php foreach ( $ms as $m ) : ?>
141
  <p style="padding: .5em; background-color: #<?php echo $messages[$m]['color']; ?>; color: #fff; font-weight: bold;"><?php echo $messages[$m]['text']; ?></p>
142
  <?php endforeach; ?>
143
+ <p><input id="key" name="key" type="text" size="15" maxlength="12" value="<?php echo get_option('wordpress_api_key'); ?>" style="font-family: 'Courier New', Courier, mono; font-size: 1.5em;" /> (<?php _e('<a href="http://akismet.com/get/">What is this?</a>'); ?>)</p>
144
  <?php if ( $invalid_key ) { ?>
145
  <h3><?php _e('Why might my key be invalid?'); ?></h3>
146
  <p><?php _e('This can mean one of two things, either you copied the key wrong or that the plugin is unable to reach the Akismet servers, which is most often caused by an issue with your web host around firewalls or similar.'); ?></p>
147
  <?php } ?>
148
  <?php } ?>
149
+ <?php akismet_nonce_field($akismet_nonce) ?>
150
  <p><label><input name="akismet_discard_month" id="akismet_discard_month" value="true" type="checkbox" <?php if ( get_option('akismet_discard_month') == 'true' ) echo ' checked="checked" '; ?> /> <?php _e('Automatically discard spam comments on posts older than a month.'); ?></label></p>
151
  <p class="submit"><input type="submit" name="submit" value="<?php _e('Update options &raquo;'); ?>" /></p>
152
  </form>
330
  if ( !get_option('wordpress_api_key') && !$wpcom_api_key && !isset($_POST['submit']) ) {
331
  function akismet_warning() {
332
  echo "
333
+ <div id='akismet-warning' class='updated fade'><p><strong>".__('Akismet is almost ready.')."</strong> ".sprintf(__('You must <a href="%1$s">enter your Akismet API key</a> for it to work.'), "plugins.php?page=akismet-key-config")."</p></div>
334
  ";
335
  }
336
  add_action('admin_notices', 'akismet_warning');
1107
  ?>
1108
  <?php echo $before_widget; ?>
1109
  <?php echo $before_title . $options['title'] . $after_title; ?>
1110
+ <div id="akismetwrap"><div id="akismetstats"><a id="aka" href="http://akismet.com" title=""><?php printf( __( '%1$s %2$sspam comments%3$s %4$sblocked by%5$s<br />%6$sAkismet%7$s' ), '<span id="akismet1"><span id="akismetcount">' . $count . '</span>', '<span id="akismetsc">', '</span></span>', '<span id="akismet2"><span id="akismetbb">', '</span>', '<span id="akismeta">', '</span></span>' ); ?></a></div></div>
1111
  <?php echo $after_widget; ?>
1112
  <?php
1113
  }
1131
  $options = $newoptions = get_option('widget_akismet');
1132
  if ( $_POST["akismet-submit"] ) {
1133
  $newoptions['title'] = strip_tags(stripslashes($_POST["akismet-title"]));
1134
+ if ( empty($newoptions['title']) ) $newoptions['title'] = __('Spam Blocked');
1135
  }
1136
  if ( $options != $newoptions ) {
1137
  $options = $newoptions;
readme.txt CHANGED
@@ -3,7 +3,7 @@ Contributors: matt, ryan, andy, mdawaffe, tellyworth, automattic
3
  Tags: akismet, comments, spam
4
  Requires at least: 2.0
5
  Tested up to: 3.0
6
- Stable tag: 2.2.9
7
 
8
  Akismet checks your comments against the Akismet web service to see if they look like spam or not.
9
 
@@ -16,16 +16,21 @@ Want to show off how much spam Akismet has caught for you? Just put `<?php akism
16
 
17
  See also: [WP Stats plugin](http://wordpress.org/extend/plugins/stats/).
18
 
19
- PS: You'll need a [WordPress.com API key](http://wordpress.com/api-keys/) to use it.
20
 
21
  == Installation ==
22
 
23
- Upload the Akismet plugin to your blog, Activate it, then enter your [WordPress.com API key](http://wordpress.com/api-keys/).
24
 
25
  1, 2, 3: You're done!
26
 
27
  == Changelog ==
28
 
 
 
 
 
 
29
  = 2.2.9 =
30
 
31
  * Eliminate a potential conflict with some plugins that may cause spurious reports
3
  Tags: akismet, comments, spam
4
  Requires at least: 2.0
5
  Tested up to: 3.0
6
+ Stable tag: 2.3.0
7
 
8
  Akismet checks your comments against the Akismet web service to see if they look like spam or not.
9
 
16
 
17
  See also: [WP Stats plugin](http://wordpress.org/extend/plugins/stats/).
18
 
19
+ PS: You'll need an [Akismet.com API key](http://akismet.com/get/) to use it.
20
 
21
  == Installation ==
22
 
23
+ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.com API key](http://akismet.com/get/).
24
 
25
  1, 2, 3: You're done!
26
 
27
  == Changelog ==
28
 
29
+ * Fix "Are you sure" nonce message on config screen in WPMU
30
+ * Fix XHTML compliance issue in sidebar widget
31
+ * Change author link; remove some old references to WordPress.com accounts
32
+ * Localize the widget title (core ticket #13879)
33
+
34
  = 2.2.9 =
35
 
36
  * Eliminate a potential conflict with some plugins that may cause spurious reports