Merge pull request #600 from CleanTalk/beta.6.55.ag

Beta.6.55. Final merge

Author: alexandergull

cleantalk.php

@@ -4,7 +4,7 @@
   Plugin Name: Anti-Spam by CleanTalk
   Plugin URI: https://cleantalk.org
   Description: Max power, all-in-one, no Captcha, premium anti-spam plugin. No comment spam, no registration spam, no contact spam, protects any WordPress forms.
-  Version: 6.54
+  Version: 6.55
   Author: CleanTalk - Anti-Spam Protection <welcome@cleantalk.org>
   Author URI: https://cleantalk.org
   Text Domain: cleantalk-spam-protect
@@ -429,6 +429,14 @@ function apbct_write_js_errors($data)
     apbct_form__learnpress__testSpam();
 }
 
+// Appointment Booking Calendar
+if (
+    apbct_is_plugin_active('appointment-booking-calendar/cpabc_appointments.php') &&
+    Post::getString('cpabc_appointments_post')
+) {
+    apbct_form__appointment_booking_calendar__testSpam();
+}
+
 // OptimizePress
 if (
     apbct_is_plugin_active('op-dashboard/op-dashboard.php') &&
@@ -616,9 +624,7 @@ function apbct_write_js_errors($data)
          ! Server::inUri('/favicon.ico') &&
          ! apbct_is_cli()
     ) {
-        wp_suspend_cache_addition(true);
-        apbct_sfw__check();
-        wp_suspend_cache_addition(false);
+        add_action('init', 'apbct_sfw__init_wrapper', 1);
     }
 }
 
@@ -840,6 +846,17 @@ function apbct_wpms__delete_blog(WP_Site $old_site)
     }
 }
 
+/**
+ * Wrapper for SpamFireWall check to make if fire on 'init' hook
+ * @return void
+ */
+function apbct_sfw__init_wrapper()
+{
+    wp_suspend_cache_addition(true);
+    apbct_sfw__check();
+    wp_suspend_cache_addition(false);
+}
+
 /**
  * Function for SpamFireWall check
  */