Skip to content

Commit 1b7c483

Browse files
committed
Merge branch 'dev' into ee-shotrcode-to-exclude.ag
# Conflicts: # lib/Cleantalk/Antispam/EmailEncoder/EmailEncoder.php
2 parents de03d96 + fc6bd35 commit 1b7c483

27 files changed

Lines changed: 251 additions & 51 deletions

cleantalk.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Plugin Name: Anti-Spam by CleanTalk
55
Plugin URI: https://cleantalk.org
66
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.
7-
Version: 6.55.99-dev
7+
Version: 6.56.99-dev
88
Author: CleanTalk - Anti-Spam Protection <welcome@cleantalk.org>
99
Author URI: https://cleantalk.org
1010
Text Domain: cleantalk-spam-protect
@@ -269,7 +269,7 @@ function apbct_register_my_rest_routes()
269269
global $apbct;
270270

271271
// Self cron
272-
$ct_cron = new Cron();
272+
$ct_cron = Cron::getInstance();
273273
$tasks_to_run = $ct_cron->checkTasks(); // Check for current tasks. Drop tasks inner counters.
274274
if (
275275
$tasks_to_run && // There are tasks to run

inc/cleantalk-integrations-by-hook.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -399,6 +399,11 @@
399399
'setting' => 'forms__contact_forms_test',
400400
'ajax' => true
401401
),
402+
'WPZOOMForms' => array(
403+
'hook' => 'admin_post_nopriv_wpzf_submit',
404+
'setting' => 'forms__contact_forms_test',
405+
'ajax' => false
406+
),
402407
'Newsletter' => array(
403408
'hook' => 'newsletter_action',
404409
'setting' => 'forms__contact_forms_test',

inc/cleantalk-pluggable.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1325,6 +1325,7 @@ function apbct_is_skip_request($ajax = false, $ajax_message_obj = array())
13251325
) &&
13261326
Post::get('action') === 'edd_add_to_cart' ||
13271327
Post::get('action') === 'edd_get_shipping_rate' ||
1328+
Post::get('action') === 'edd_check_email' ||
13281329
Post::get('action') === 'edd_recalculate_discounts_pro'
13291330
) {
13301331
return 'Easy Digital Downloads service action';

inc/cleantalk-public-validate.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,21 @@ function_exists('hivepress') &&
398398
),
399399
)
400400
);
401+
} else if (
402+
// BuddyBoss App - request from mobile app usually
403+
apbct_is_plugin_active('buddyboss-app/buddyboss-app.php') &&
404+
Server::getString('REQUEST_URI') === '/wp-json/buddyboss-app/v1/signup'
405+
) {
406+
$data = [
407+
'code' => 'bp_rest_register_errors',
408+
'message' => [
409+
'signup_email' => $ct_result->comment
410+
],
411+
'data' => [
412+
'status' => 403,
413+
],
414+
];
415+
wp_send_json($data);
401416
} else {
402417
ct_die(null, null);
403418
}

inc/cleantalk-settings.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1522,7 +1522,7 @@ function apbct_settings__get_top_info()
15221522
);
15231523
$get_premium_request_badge = apbct_admin__badge__get_premium('top_info');
15241524

1525-
if ($apbct->white_label) {
1525+
if ($apbct->data['wl_mode_enabled'] || $apbct->white_label) {
15261526
$support_brand = $apbct->data['wl_brandname_short'];
15271527
$support_url_text = $apbct->data['wl_support_url'];
15281528
$trademark = '';

js/apbct-public-bundle.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/apbct-public-bundle_ext-protection.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/apbct-public-bundle_ext-protection.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/apbct-public-bundle_full-protection.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/apbct-public-bundle_full-protection.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)