Updating packages for 5.1.1

Signed-off-by: Yury German <blueknight@gentoo.org>

8 files changed, 73 insertions, 8 deletions

diff --git a/plugins/akismet/_inc/akismet.css b/plugins/akismet/_inc/akismet.css
index bf40fb14..d051c011 100644
--- a/plugins/akismet/_inc/akismet.css
+++ b/plugins/akismet/_inc/akismet.css
@@ -216,8 +216,16 @@ table.comments td.comment p a:after {
 /**
  * For the activation notice on the plugins page.
  */
+
+#akismet_setup_prompt {
+	background: none;
+	border: none;
+	margin: 0;
+	padding: 0;
+	width: 100%;
+}
+
 .akismet_activate {
-	min-width: 825px;
 	border: 1px solid #4F800D;
 	padding: 5px;
 	margin: 15px 0;
@@ -287,6 +295,7 @@ table.comments td.comment p a:after {
 }
 
 .akismet_activate .aa_button_container {
+	box-sizing: border-box;
 	display: inline-block;
 	background: #DEF1B8;
 	padding: 5px;
@@ -311,6 +320,32 @@ table.comments td.comment p a:after {
 	font-weight: normal;
 }
 
+@media (max-width: 550px) {
+	.akismet_activate .aa_a {
+		display: none;
+	}
+	
+	.akismet_activate .aa_button_container {
+		width: 100%;
+	}
+}
+
+@media (max-width: 782px) {
+	.akismet_activate {
+		min-width: 0;
+	}
+}
+
+@media (max-width: 850px) {
+	#akismet_setup_prompt .aa_description {
+		display: none;
+	}
+	
+	.akismet_activate {
+		min-width: 0;
+	}
+}
+
 .jetpack_page_akismet-key-config #wpcontent, .settings_page_akismet-key-config #wpcontent {
 	padding-left: 0;
 }
diff --git a/plugins/akismet/_inc/akismet.js b/plugins/akismet/_inc/akismet.js
index b5df186f..8ed3add1 100644
--- a/plugins/akismet/_inc/akismet.js
+++ b/plugins/akismet/_inc/akismet.js
@@ -282,4 +282,22 @@ jQuery( function ( $ ) {
                         url: './options-general.php?page=akismet-key-config&akismet_comment_form_privacy_notice=hide',
 		});
 	});
+
+	$( ".akismet-could-be-primary" ).each( function () {
+		var form = $( this ).closest( 'form' );
+
+		form.data( 'initial-state', form.serialize() );
+
+		form.on( 'change keyup', function () {
+			var self = $( this );
+			var submit_button = self.find( ".akismet-could-be-primary" );
+
+			if ( self.serialize() != self.data( 'initial-state' ) ) {
+				submit_button.addClass( "akismet-is-primary" );
+			}
+			else {
+				submit_button.removeClass( "akismet-is-primary" );
+			}
+		} );
+	} );
 });
diff --git a/plugins/akismet/akismet.php b/plugins/akismet/akismet.php
index 800dd724..2e07b3ef 100644
--- a/plugins/akismet/akismet.php
+++ b/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 <strong>protect your blog from spam</strong>. 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
+Version: 4.1.1
 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' );
+define( 'AKISMET_VERSION', '4.1.1' );
 define( 'AKISMET__MINIMUM_WP_VERSION', '4.0' );
 define( 'AKISMET__PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
 define( 'AKISMET_DELETE_LIMIT', 100000 );
diff --git a/plugins/akismet/class.akismet.php b/plugins/akismet/class.akismet.php
index 9b70d9ec..7dc8ba91 100644
--- a/plugins/akismet/class.akismet.php
+++ b/plugins/akismet/class.akismet.php
@@ -575,6 +575,11 @@ class Akismet {
 		if ( $new_status == $old_status )
 			return;
 
+		if ( 'spam' === $new_status || 'spam' === $old_status ) {
+			// Clear the cache of the "X comments in your spam queue" count on the dashboard.
+			wp_cache_delete( 'akismet_spam_count', 'widget' );
+		}
+
 		# we don't need to record a history item for deleted comments
 		if ( $new_status == 'delete' )
 			return;
diff --git a/plugins/akismet/readme.txt b/plugins/akismet/readme.txt
index 9473fb95..41495d86 100644
--- a/plugins/akismet/readme.txt
+++ b/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.0
-Stable tag: 4.1
+Tested up to: 5.1
+Stable tag: 4.1.1
 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,13 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
 
 == Changelog ==
 
+= 4.1.1 =
+*Release Date - 31 January 2019*
+
+* Fixed the "Setup Akismet" notice so it resizes responsively.
+* Only highlight the "Save Changes" button in the Akismet config when changes have been made.
+* The count of comments in your spam queue shown on the dashboard show now always be up-to-date.
+
 = 4.1 =
 *Release Date - 12 November 2018*
 
diff --git a/plugins/akismet/views/config.php b/plugins/akismet/views/config.php
index cc6fdd20..6bbcd6d4 100644
--- a/plugins/akismet/views/config.php
+++ b/plugins/akismet/views/config.php
@@ -173,7 +173,7 @@
 							<?php wp_nonce_field(Akismet_Admin::NONCE) ?>
 							<div id="publishing-action">
 								<input type="hidden" name="action" value="enter-key">
-								<input type="submit" name="submit" id="submit" class="akismet-button akismet-is-primary" value="<?php esc_attr_e('Save Changes', 'akismet');?>">
+								<input type="submit" name="submit" id="submit" class="akismet-button akismet-could-be-primary" value="<?php esc_attr_e('Save Changes', 'akismet');?>">
 							</div>
 							<div class="clear"></div>
 						</div>
diff --git a/plugins/akismet/views/get.php b/plugins/akismet/views/get.php
index c9dbf108..bfd34c7c 100644
--- a/plugins/akismet/views/get.php
+++ b/plugins/akismet/views/get.php
@@ -2,5 +2,5 @@
 	<input type="hidden" name="passback_url" value="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>"/>
 	<input type="hidden" name="blog" value="<?php echo esc_url( get_option( 'home' ) ); ?>"/>
 	<input type="hidden" name="redirect" value="<?php echo isset( $redirect ) ? $redirect : 'plugin-signup'; ?>"/>
-	<input type="submit" class="<?php echo isset( $classes ) && count( $classes ) > 0 ? implode( ' ', $classes ) : 'akismet-button akismet-is-primary';?>" value="<?php echo esc_attr( $text ); ?>"/>
+	<input type="submit" class="<?php echo isset( $classes ) && count( $classes ) > 0 ? implode( ' ', $classes ) : 'akismet-button';?>" value="<?php echo esc_attr( $text ); ?>"/>
 </form>
\ No newline at end of file
diff --git a/plugins/akismet/views/notice.php b/plugins/akismet/views/notice.php
index 62476bd2..7f70fc12 100644
--- a/plugins/akismet/views/notice.php
+++ b/plugins/akismet/views/notice.php
@@ -1,5 +1,5 @@
 <?php if ( $type == 'plugin' ) :?>
-<div class="updated" style="padding: 0; margin: 0; border: none; background: none;">
+<div class="updated" id="akismet_setup_prompt">
 	<form name="akismet_activate" action="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>" method="POST">
 		<div class="akismet_activate">
 			<div class="aa_a">A</div>