From ab767d77b6406e25f7209ae8a861452c305f712e Mon Sep 17 00:00:00 2001
From: Florian Brinkmann <2310924+florianbrinkmann@users.noreply.github.com>
Date: Sun, 3 Sep 2023 06:15:12 +0200
Subject: [PATCH] prepare 2.11.4 release (#524)

* chore: prepare 2.11.4 release

* Update CHANGELOG.md

* Update readme.txt
---
 CHANGELOG.md     | 17 +++++++++++++++++
 antispam_bee.php |  5 +++--
 readme.txt       | 12 ++++++++++--
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff975bf2..d8adc9b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
 ## Changelog ##
 
+### 2.11.4 ###
+IMPORTANT: If you use the country check and are behind a proxy or similar, you need to use the `pre_comment_user_ip` filter to get the correct IP from a header like `HTTP_X_FORWARDED`.  
+WICHTIG: Wenn du den Spam-Check für bestimmte Länder verwendest und hinter einem Proxy oder ähnlich bist, musst du den `pre_comment_user_ip`-Filter verwenden, um die richtige Adresse des Users von einem Header wie `HTTP_X_FORWARDED` zu bekommen.
+* **English**
+  * Fix: Read client IP for country check from `REMOTE_ADDR` only (filterable via `pre_comment_user_ip`)
+  * Fix: No spam reason in spam notification email, and related PHP warning
+  * Fix: Remove outdated info from readme
+  * Enhancement: Show upgrade notice on plugin overview page
+  * Maintenance: Tested up to WordPress 6.3
+
+* **Deutsch**
+  * Fix: Client-IP wird nur noch aus `REMOTE_ADDR` ermittelt (filterbar über `pre_comment_user_ip`)
+  * Fix: Der Spam-Grund wird wieder korrekt in der Benachrichtigungs-E-Mail zu Spam angezeigt und die damit zusammenhängende PHP-Warning behoben
+  * Fix: Veraltete Infos aus der Readme wurden entfernt
+  * Verbesserung: Upgrade-Hinweis wird auch in der Plugin-Übersicht angezeigt
+  * Wartung: Getestet mit WordPress 6.3
+
 ### 2.11.3 ###
 * **English**
   * Fix: Multiselect for "Delete comments by spam reasons" was not saving values
diff --git a/antispam_bee.php b/antispam_bee.php
index 7099fc66..d50a966a 100755
--- a/antispam_bee.php
+++ b/antispam_bee.php
@@ -9,7 +9,7 @@
  * Domain Path: /lang
  * License:     GPLv2 or later
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
- * Version:     2.11.3
+ * Version:     2.11.4
  *
  * @package Antispam Bee
  **/
@@ -1084,7 +1084,7 @@ public static function clear_scheduled_hook() {
 	/**
 	 * Shows plugin update notice
 	 *
-	 * @since  2.12.0
+	 * @since  2.11.4
 	 *
 	 * @param array $data An array of plugin metadata. See get_plugin_data()
 	 *                    and the {@see 'plugin_row_meta'} filter for the list
@@ -2449,6 +2449,7 @@ private static function _go_in_peace() {
 	 * Return real client IP
 	 *
 	 * @since   2.6.1
+	 * @since   2.11.4 Only use `REMOTE_ADDR` to get the IP, make it filterable with `pre_comment_user_ip`
 	 *
 	 * @hook    string  pre_comment_user_ip  The Client IP
 	 *
diff --git a/readme.txt b/readme.txt
index 239f5868..356867ee 100755
--- a/readme.txt
+++ b/readme.txt
@@ -3,9 +3,9 @@
 * Tags:              anti-spam, antispam, block spam, comment, comments, comment spam, pingback, spam, spam filter, trackback, GDPR
 * Donate link:       https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=TD4AMD2D8EMZW
 * Requires at least: 4.5
-* Tested up to:      6.2
+* Tested up to:      6.3
 * Requires PHP:      5.2
-* Stable tag:        2.11.3
+* Stable tag:        2.11.4
 * License:           GPLv2 or later
 * License URI:       https://www.gnu.org/licenses/gpl-2.0.html
 
@@ -95,6 +95,14 @@ A complete documentation is available on [pluginkollektiv.org](https://antispamb
 
 ## Changelog ##
 
+### 2.11.4 ###
+IMPORTANT: If you use the country check and are behind a proxy or similar, you need to use the `pre_comment_user_ip` filter to get the correct IP from a header like `HTTP_X_FORWARDED`.
+  * Fix: Read client IP for country check from `REMOTE_ADDR` only (filterable via `pre_comment_user_ip`)
+  * Fix: No spam reason in spam notification email, and related PHP warning
+  * Fix: Remove outdated info from readme
+  * Enhancement: Show upgrade notice on plugin overview page
+  * Maintenance: Tested up to WordPress 6.3
+
 ### 2.11.3 ###
   * Fix: Multiselect for "Delete comments by spam reasons" was not saving values
   * Fix: Fix broken link for ISO country codes