Skip to content

Commit 784c54f

Browse files
committed
Merge remote-tracking branch 'origin/master' into fix
2 parents ecda972 + 40b335f commit 784c54f

23 files changed

Lines changed: 451 additions & 29 deletions

.github/workflows/tests.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on: # event list
1111
branches:
1212
- dev
1313
- master
14+
- '**'
1415

1516
env: # environment variables (available in any part of the action)
1617
PHP_VERSION: 7.4

cleantalk.php

Lines changed: 1 addition & 1 deletion
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.76.99-fix
7+
Version: 6.77
88
Author: CleanTalk - Anti-Spam Protection <welcome@cleantalk.org>
99
Author URI: https://cleantalk.org
1010
Text Domain: cleantalk-spam-protect

inc/cleantalk-common.php

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -607,6 +607,14 @@ function apbct_get_sender_info()
607607
$page_hits = RequestParameters::get('apbct_page_hits', Cookie::$force_alt_cookies_global);
608608
$page_hits = !empty($page_hits) ? TT::toString($page_hits) : null;
609609

610+
$ct_options = json_encode(
611+
array_merge(
612+
(array) $apbct->settings,
613+
['data__bot_detector_enabled' => apbct__is_bot_detector_enabled() ? 1 : 0]
614+
),
615+
JSON_UNESCAPED_SLASHES
616+
);
617+
610618
//Let's keep $data_array for debugging
611619
$data_array = array(
612620
'plugin_request_id' => $apbct->plugin_request_id,
@@ -615,7 +623,7 @@ function apbct_get_sender_info()
615623
'USER_AGENT' => Server::get('HTTP_USER_AGENT'),
616624
'page_url' => apbct_sender_info___get_page_url(),
617625
'cms_lang' => substr(get_locale(), 0, 2),
618-
'ct_options' => json_encode($apbct->settings, JSON_UNESCAPED_SLASHES),
626+
'ct_options' => $ct_options,
619627
'fields_number' => sizeof($_POST),
620628
'direct_post' => $cookie_is_ok === null && apbct_is_post() ? 1 : 0,
621629
// Raw data to validated JavaScript test in the cloud

inc/cleantalk-integrations-by-hook.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
'ajax' => false
136136
),
137137
'EasyDigitalDownloads' => array(
138-
'hook' => array('edd_pre_process_register_form', 'edd_insert_user_args'),
138+
'hook' => array('edd_pre_process_register_form', 'edd_insert_user_args', 'edd_customer_pre_create'),
139139
'setting' => 'forms__registrations_test',
140140
'ajax' => false
141141
),

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_gathering.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

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_gathering.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/cleantalk-admin-settings-page.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/cleantalk-admin-settings-page.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)