diff --git a/wp-content/plugins/akismet/_inc/akismet.css b/wp-content/plugins/akismet/_inc/akismet.css
index d051c01..bc56f06 100644
--- a/wp-content/plugins/akismet/_inc/akismet.css
+++ b/wp-content/plugins/akismet/_inc/akismet.css
@@ -80,9 +80,11 @@ table.comments td.comment p a:after {
display: inline-block !important;
}
.checkforspam-progress {
- padding-left: 1ex;
display: none;
}
+.checkforspam.checking .checkforspam-progress {
+ padding-left: 1ex;
+}
.checkforspam.button-disabled .checkforspam-progress {
display: inline;
}
@@ -246,7 +248,6 @@ table.comments td.comment p a:after {
font-size: 140px;
color: #769F33;
font-family: Georgia, "Times New Roman", Times, serif;
- z-index: 1;
}
.akismet_activate .aa_button {
@@ -312,7 +313,6 @@ table.comments td.comment p a:after {
margin-left: 25px;
color: #E5F2B1;
font-size: 15px;
- z-index: 1000;
}
.akismet_activate .aa_description strong {
diff --git a/wp-content/plugins/akismet/_inc/akismet.js b/wp-content/plugins/akismet/_inc/akismet.js
index 8ed3add..6cb85e6 100644
--- a/wp-content/plugins/akismet/_inc/akismet.js
+++ b/wp-content/plugins/akismet/_inc/akismet.js
@@ -146,10 +146,15 @@ jQuery( function ( $ ) {
} );
} );
- $('.checkforspam:not(.button-disabled)').click( function(e) {
+ $( '.checkforspam' ).click( function( e ) {
e.preventDefault();
- $('.checkforspam:not(.button-disabled)').addClass('button-disabled');
+ if ( $( this ).hasClass( 'button-disabled' ) ) {
+ window.location.href = $( this ).data( 'success-url' ).replace( '__recheck_count__', 0 ).replace( '__spam_count__', 0 );
+ return;
+ }
+
+ $('.checkforspam').addClass('button-disabled').addClass( 'checking' );
$('.checkforspam-spinner').addClass( 'spinner' ).addClass( 'is-active' );
// Update the label on the "Check for Spam" button to use the active "Checking for Spam" language.
diff --git a/wp-content/plugins/akismet/akismet.php b/wp-content/plugins/akismet/akismet.php
index 2e07b3e..49608e5 100644
--- a/wp-content/plugins/akismet/akismet.php
+++ b/wp-content/plugins/akismet/akismet.php
@@ -6,7 +6,7 @@
Plugin Name: Akismet Anti-Spam
Plugin URI: https://akismet.com/
Description: Used by millions, Akismet is quite possibly the best way in the world to protect your blog from spam. It keeps your site protected even while you sleep. To get started: activate the Akismet plugin and then go to your Akismet Settings page to set up your API key.
-Version: 4.1.1
+Version: 4.1.2
Author: Automattic
Author URI: https://automattic.com/wordpress-plugins/
License: GPLv2 or later
@@ -37,7 +37,7 @@ if ( !function_exists( 'add_action' ) ) {
exit;
}
-define( 'AKISMET_VERSION', '4.1.1' );
+define( 'AKISMET_VERSION', '4.1.2' );
define( 'AKISMET__MINIMUM_WP_VERSION', '4.0' );
define( 'AKISMET__PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
define( 'AKISMET_DELETE_LIMIT', 100000 );
diff --git a/wp-content/plugins/akismet/class.akismet-admin.php b/wp-content/plugins/akismet/class.akismet-admin.php
index 07a4d19..f0766eb 100644
--- a/wp-content/plugins/akismet/class.akismet-admin.php
+++ b/wp-content/plugins/akismet/class.akismet-admin.php
@@ -390,9 +390,9 @@ class Akismet_Admin {
$comments_count = wp_count_comments();
echo '';
- echo '';
+ echo '
';
echo '
$args[0],
@@ -1346,6 +1362,7 @@ p {
'comment_type' => 'pingback',
'akismet_pre_check' => '1',
'comment_pingback_target' => $args[1],
+ 'pingbacks_closed' => $pingbacks_closed ? '1' : '0',
);
$comment = Akismet::auto_check_comment( $comment );
@@ -1356,29 +1373,7 @@ p {
}
}
}
-
- public static function pingback_forwarded_for( $r, $url ) {
- static $urls = array();
-
- // Call this with $r == null to prime the callback to add headers on a specific URL
- if ( is_null( $r ) && !in_array( $url, $urls ) ) {
- $urls[] = $url;
- }
- // Add X-Pingback-Forwarded-For header, but only for requests to a specific URL (the apparent pingback source)
- if ( is_array( $r ) && is_array( $r['headers'] ) && !isset( $r['headers']['X-Pingback-Forwarded-For'] ) && in_array( $url, $urls ) ) {
- $remote_ip = preg_replace( '/[^a-fx0-9:.,]/i', '', $_SERVER['REMOTE_ADDR'] );
-
- // Note: this assumes REMOTE_ADDR is correct, and it may not be if a reverse proxy or CDN is in use
- $r['headers']['X-Pingback-Forwarded-For'] = $remote_ip;
-
- // Also identify the request as a pingback verification in the UA string so it appears in logs
- $r['user-agent'] .= '; verifying pingback from ' . $remote_ip;
- }
-
- return $r;
- }
-
/**
* Ensure that we are loading expected scalar values from akismet_as_submitted commentmeta.
*
diff --git a/wp-content/plugins/akismet/readme.txt b/wp-content/plugins/akismet/readme.txt
index 41495d8..15526e9 100644
--- a/wp-content/plugins/akismet/readme.txt
+++ b/wp-content/plugins/akismet/readme.txt
@@ -2,8 +2,8 @@
Contributors: matt, ryan, andy, mdawaffe, tellyworth, josephscott, lessbloat, eoigal, cfinke, automattic, jgs, procifer, stephdau
Tags: akismet, comments, spam, antispam, anti-spam, anti spam, comment moderation, comment spam, contact form spam, spam comments
Requires at least: 4.0
-Tested up to: 5.1
-Stable tag: 4.1.1
+Tested up to: 5.2
+Stable tag: 4.1.2
License: GPLv2 or later
Akismet checks your comments and contact form submissions against our global database of spam to protect you and your site from malicious content.
@@ -30,6 +30,15 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
== Changelog ==
+= 4.1.2 =
+*Release Date - 14 May 2019*
+
+* Fixed a conflict between the Akismet setup banner and other plugin notices.
+* Reduced the number of API requests made by the plugin when attempting to verify the API key.
+* Include additional data in the pingback pre-check API request to help make the stats more accurate.
+* Fixed a bug that was enabling the "Check for Spam" button when no comments were eligible to be checked.
+* Improved Akismet's AMP compatibility.
+
= 4.1.1 =
*Release Date - 31 January 2019*
diff --git a/wp-content/plugins/akismet/views/get.php b/wp-content/plugins/akismet/views/get.php
index bfd34c7..b1abe0e 100644
--- a/wp-content/plugins/akismet/views/get.php
+++ b/wp-content/plugins/akismet/views/get.php
@@ -1,3 +1,9 @@
+