From 8fccb2d16fcc7f9ce67447e4771ca23829d97f33 Mon Sep 17 00:00:00 2001 From: "James K." Date: Sun, 22 Oct 2023 14:04:46 -0400 Subject: [PATCH] Hotfix for overaggressive filters. --- composer.json | 2 +- i18n/TouchPoint-WP.pot | 4 ++-- package.json | 2 +- src/TouchPoint-WP/TouchPointWP.php | 2 +- src/TouchPoint-WP/Utilities.php | 16 ++++++++-------- src/python/WebApi.py | 2 +- touchpoint-wp.php | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index e8040e1..595caf6 100644 --- a/composer.json +++ b/composer.json @@ -3,7 +3,7 @@ "description": "A WordPress Plugin for integrating with TouchPoint Church Management Software.", "license": "AGPL-3.0-or-later", "type": "wordpress-plugin", - "version": "0.0.35", + "version": "0.0.36", "keywords": [ "wordpress", "wp", diff --git a/i18n/TouchPoint-WP.pot b/i18n/TouchPoint-WP.pot index 7429662..76ea0c4 100644 --- a/i18n/TouchPoint-WP.pot +++ b/i18n/TouchPoint-WP.pot @@ -2,14 +2,14 @@ # This file is distributed under the AGPLv3+. msgid "" msgstr "" -"Project-Id-Version: TouchPoint WP 0.0.35\n" +"Project-Id-Version: TouchPoint WP 0.0.36\n" "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/TouchPoint-WP\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2023-10-07T12:42:23+00:00\n" +"POT-Creation-Date: 2023-10-22T18:00:47+00:00\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "X-Generator: WP-CLI 2.8.1\n" "X-Domain: TouchPoint-WP\n" diff --git a/package.json b/package.json index aba6a64..dfe4f2a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "touchpoint-wp", - "version": "0.0.35", + "version": "0.0.36", "description": "A WordPress Plugin for integrating with TouchPoint Church Management Software.", "directories": { "doc": "docs" diff --git a/src/TouchPoint-WP/TouchPointWP.php b/src/TouchPoint-WP/TouchPointWP.php index 0063c93..880f456 100644 --- a/src/TouchPoint-WP/TouchPointWP.php +++ b/src/TouchPoint-WP/TouchPointWP.php @@ -33,7 +33,7 @@ class TouchPointWP /** * Version number */ - public const VERSION = "0.0.35"; + public const VERSION = "0.0.36"; /** * The Token diff --git a/src/TouchPoint-WP/Utilities.php b/src/TouchPoint-WP/Utilities.php index 27fcb3d..c40a219 100644 --- a/src/TouchPoint-WP/Utilities.php +++ b/src/TouchPoint-WP/Utilities.php @@ -723,14 +723,14 @@ public static function getClientIp(): ?string /** * Determine if an email address or user should be accepted as a new registrant. (e.g. informal auth) * - * @param string $nickname - * @param string $emailAddress + * @param ?string $nickname + * @param ?string $emailAddress * @param ?string $resultComment If a spam provider provides a comment about why content was allowed or rejected, * it goes here. * * @return bool True if acceptable, false if not acceptable. */ - public static function validateRegistrantEmailAddress(string $nickname, string $emailAddress, string &$resultComment = null): bool { + public static function validateRegistrantEmailAddress(?string $nickname, ?string $emailAddress, ?string &$resultComment = null): bool { // CleanTalk filter if (file_exists(ABSPATH . '/wp-content/plugins/cleantalk-spam-protect/cleantalk.php') || function_exists('ct_test_registration')) { @@ -755,15 +755,15 @@ public static function validateRegistrantEmailAddress(string $nickname, string $ /** * Determine if an email address or user should be accepted as a new registrant. (e.g. informal auth) * - * @param string $nickname - * @param string $emailAddress - * @param string $message - * @param ?string $resultComment If a spam provider provides a comment about why content was allowed or rejected, + * @param ?string $nickname + * @param ?string $emailAddress + * @param ?string $message + * @param ?string $resultComment If a spam provider provides a comment about why content was allowed or rejected, * it goes here. * * @return bool True if acceptable, false if not acceptable. */ - public static function validateMessage(string $nickname, string $emailAddress, string $message, string &$resultComment = null): bool + public static function validateMessage(?string $nickname, ?string $emailAddress, ?string $message, ?string &$resultComment = null): bool { // CleanTalk filter if (file_exists(ABSPATH . '/wp-content/plugins/cleantalk-spam-protect/cleantalk.php') diff --git a/src/python/WebApi.py b/src/python/WebApi.py index c26545d..4ca213e 100644 --- a/src/python/WebApi.py +++ b/src/python/WebApi.py @@ -5,7 +5,7 @@ import linecache import sys -VERSION = "0.0.35" +VERSION = "0.0.36" sgContactEvName = "Contact" diff --git a/touchpoint-wp.php b/touchpoint-wp.php index 4b606a8..568c8b2 100644 --- a/touchpoint-wp.php +++ b/touchpoint-wp.php @@ -14,7 +14,7 @@ Plugin URI: https://github.com/tenthpres/touchpoint-wp Update URI: https://github.com/tenthpres/touchpoint-wp Description: A WordPress Plugin for integrating with TouchPoint Church Management Software. -Version: 0.0.35 +Version: 0.0.36 Author: James K Author URI: https://github.com/jkrrv License: AGPLv3+