From 2656f77e7c17ebd6cf9bf02b53b25f9f265bc8e5 Mon Sep 17 00:00:00 2001 From: Tim Carr Date: Mon, 7 Mar 2022 16:54:45 +0000 Subject: [PATCH] 1.9.6.9 --- ACTIONS-FILTERS.md | 95 ++++++++++++++++++++++++++++++++------ languages/convertkit.pot | 98 ++++++++++++++++++++++++++++++++-------- readme.txt | 4 ++ wp-convertkit.php | 4 +- 4 files changed, 167 insertions(+), 34 deletions(-) diff --git a/ACTIONS-FILTERS.md b/ACTIONS-FILTERS.md index 1313aa713..d462b20bf 100644 --- a/ACTIONS-FILTERS.md +++ b/ACTIONS-FILTERS.md @@ -311,7 +311,7 @@ add_filter( 'convertkit_block_content_render', function( $content, $atts, $subsc

convertkit_block_form_render - includes/blocks/class-convertkit-block-form.php::286 + includes/blocks/class-convertkit-block-form.php::312

Overview

Filter the block's content immediately before it is output.

Parameters

@@ -747,7 +747,7 @@ add_filter( 'convertkit_term_get_default_settings', function( $defaults ) {

convertkit_api_get_timeout - includes/class-convertkit-api.php::1066 + includes/class-convertkit-api.php::1251

Overview

Defines the maximum time to allow the API request to run.

Parameters

@@ -1078,12 +1078,20 @@ add_filter( 'convertkit_is_admin_or_frontend_editor', function( $is_admin_or_fro + + + + + + + + @@ -1276,7 +1284,7 @@ do_action( 'convertkit_admin_post_enqueue_styles', function( ) {

convertkit_api_form_subscribe_success - includes/class-convertkit-api.php::186 + includes/class-convertkit-api.php::207

Overview

Runs actions immediately after the email address was successfully subscribed to the form.

Parameters

  convertkit_api_form_unsubscribe_success Runs actions immediately after the email address was successfully unsubscribed.
 convertkit_api_purchase_create_successRuns actions immediately after the purchase data address was successfully created.
../includes/class-convertkit-gutenberg.php
  convertkit_gutenberg_enqueue_scripts Enqueue any additional scripts for Gutenberg blocks that have been registered.
 convertkit_gutenberg_enqueue_styles
../includes/class-convertkit-output.php
@@ -1303,17 +1311,21 @@ do_action( 'convertkit_admin_post_enqueue_styles', function( ) { + + + +
$first_name string First
$fieldsmixedCustom Fields (false|array)

Usage

-do_action( 'convertkit_api_form_subscribe_success', function( $response, $form_id, $email, $first_name ) {
+do_action( 'convertkit_api_form_subscribe_success', function( $response, $form_id, $email, $first_name, $fields ) {
 	// ... your code here
-}, 10, 4 );
+}, 10, 5 );

convertkit_api_sequence_subscribe_success - includes/class-convertkit-api.php::295 + includes/class-convertkit-api.php::339

Overview

Runs actions immediately after the email address was successfully subscribed to the sequence.

Parameters

@@ -1336,17 +1348,21 @@ do_action( 'convertkit_api_form_subscribe_success', function( $response, $form_i + + + +
$email string Email Address
$fieldsmixedCustom Fields (false|array)

Usage

-do_action( 'convertkit_api_sequence_subscribe_success', function( $response, $sequence_id, $email ) {
+do_action( 'convertkit_api_sequence_subscribe_success', function( $response, $sequence_id, $email, $fields ) {
 	// ... your code here
-}, 10, 3 );
+}, 10, 4 );

convertkit_api_tag_subscribe_success - includes/class-convertkit-api.php::380 + includes/class-convertkit-api.php::447

Overview

Runs actions immediately after the email address was successfully subscribed to the tag.

Parameters

@@ -1369,17 +1385,21 @@ do_action( 'convertkit_api_sequence_subscribe_success', function( $response, $se + + + +
$email string Email Address
$fieldsmixedCustom Fields (false|array).

Usage

-do_action( 'convertkit_api_tag_subscribe_success', function( $response, $tag_id, $email ) {
+do_action( 'convertkit_api_tag_subscribe_success', function( $response, $tag_id, $email, $fields ) {
 	// ... your code here
-}, 10, 3 );
+}, 10, 4 );

convertkit_api_form_unsubscribe_success - includes/class-convertkit-api.php::580 + includes/class-convertkit-api.php::682

Overview

Runs actions immediately after the email address was successfully unsubscribed.

Parameters

@@ -1406,9 +1426,38 @@ do_action( 'convertkit_api_form_unsubscribe_success', function( $response, $emai // ... your code here }, 10, 2 ); +

+ convertkit_api_purchase_create_success + includes/class-convertkit-api.php::816 +

Overview

+

Runs actions immediately after the purchase data address was successfully created.

Parameters

+
+ + + + + + + + + + + + + + + + + +
ParameterTypeDescription
$responsearrayAPI Response
$purchasearrayPurchase Data

Usage

+
+do_action( 'convertkit_api_purchase_create_success', function( $response, $purchase ) {
+	// ... your code here
+}, 10, 2 );
+

convertkit_gutenberg_enqueue_scripts - includes/class-convertkit-gutenberg.php::152 + includes/class-convertkit-gutenberg.php::153

Overview

Enqueue any additional scripts for Gutenberg blocks that have been registered.

Parameters

@@ -1431,6 +1480,26 @@ do_action( 'convertkit_gutenberg_enqueue_scripts', function( $blocks ) { // ... your code here }, 10, 1 ); +

+ convertkit_gutenberg_enqueue_styles + includes/class-convertkit-gutenberg.php::174 +

Parameters

+
+ + + + + + + + + +
ParameterTypeDescription

Usage

+
+do_action( 'convertkit_gutenberg_enqueue_styles', function(  ) {
+	// ... your code here
+}, 10, 0 );
+

convertkit_output_output_form includes/class-convertkit-output.php::84 diff --git a/languages/convertkit.pot b/languages/convertkit.pot index 095fd7822..f076ff1d5 100644 --- a/languages/convertkit.pot +++ b/languages/convertkit.pot @@ -2,14 +2,14 @@ # This file is distributed under the same license as the ConvertKit plugin. msgid "" msgstr "" -"Project-Id-Version: ConvertKit 1.9.6.7\n" +"Project-Id-Version: ConvertKit 1.9.6.9\n" "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/convertkit-github\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: 2022-02-18T17:40:12+00:00\n" +"POT-Creation-Date: 2022-03-07T16:18:52+00:00\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "X-Generator: WP-CLI 2.5.0\n" "X-Domain: convertkit\n" @@ -21,7 +21,7 @@ msgstr "" #: admin/class-convertkit-admin-settings.php:109 #: admin/class-convertkit-admin-settings.php:128 #: includes/blocks/class-convertkit-block-content.php:58 -#: includes/blocks/class-convertkit-block-form.php:76 +#: includes/blocks/class-convertkit-block-form.php:90 msgid "ConvertKit" msgstr "" @@ -49,7 +49,7 @@ msgstr "" #: admin/section/class-convertkit-settings-general.php:58 #: includes/blocks/class-convertkit-block-content.php:136 -#: includes/blocks/class-convertkit-block-form.php:181 +#: includes/blocks/class-convertkit-block-form.php:207 msgid "General" msgstr "" @@ -201,7 +201,7 @@ msgstr "" msgid "Tag" msgstr "" -#: includes/blocks/class-convertkit-block-form.php:71 +#: includes/blocks/class-convertkit-block-form.php:85 #: includes/integrations/contactform7/class-convertkit-contactform7-admin-settings.php:106 #: includes/integrations/wishlist/class-convertkit-wishlist-admin-settings.php:123 #: includes/widgets/class-ck-widget-form.php:30 @@ -209,21 +209,36 @@ msgstr "" msgid "ConvertKit Form" msgstr "" -#: includes/blocks/class-convertkit-block-form.php:72 +#: includes/blocks/class-convertkit-block-form.php:86 msgid "Displays a ConvertKit Form." msgstr "" -#: includes/blocks/class-convertkit-block-form.php:77 -#: includes/blocks/class-convertkit-block-form.php:155 +#: includes/blocks/class-convertkit-block-form.php:91 +#: includes/blocks/class-convertkit-block-form.php:181 #: includes/widgets/class-ck-widget-form.php:64 #: views/backend/post/meta-box.php:15 msgid "Form" msgstr "" -#: includes/blocks/class-convertkit-block-form.php:99 +#: includes/blocks/class-convertkit-block-form.php:113 msgid "Select a Form using the Form option in the Gutenberg sidebar." msgstr "" +#. translators: Form name in ConvertKit +#: includes/blocks/class-convertkit-block-form.php:122 +msgid "Modal form \"%s\" selected. View on the frontend site to see the modal form." +msgstr "" + +#. translators: Form name in ConvertKit +#: includes/blocks/class-convertkit-block-form.php:125 +msgid "Slide in form \"%s\" selected. View on the frontend site to see the slide in form." +msgstr "" + +#. translators: Form name in ConvertKit +#: includes/blocks/class-convertkit-block-form.php:128 +msgid "Sticky bar form \"%s\" selected. View on the frontend site to see the sticky bar form." +msgstr "" + #: includes/class-convertkit-ajax.php:50 #: includes/class-convertkit-ajax.php:154 msgid "ConvertKit: Required parameter `subscriber_id` not included in AJAX request." @@ -251,41 +266,86 @@ msgstr "" msgid "ConvertKit: Required parameter `tag` not included in AJAX request." msgstr "" -#: includes/class-convertkit-api.php:247 -#: includes/class-convertkit-api.php:251 +#: includes/class-convertkit-api.php:172 +msgid "form_subscribe(): the form_id parameter is empty." +msgstr "" + +#: includes/class-convertkit-api.php:175 +msgid "form_subscribe(): the email parameter is empty." +msgstr "" + +#: includes/class-convertkit-api.php:268 +#: includes/class-convertkit-api.php:272 msgid "No sequences exist in ConvertKit. Visit your ConvertKit account and create your first sequence." msgstr "" -#: includes/class-convertkit-api.php:332 -#: includes/class-convertkit-api.php:336 +#: includes/class-convertkit-api.php:305 +msgid "sequence_subscribe(): the sequence_id parameter is empty." +msgstr "" + +#: includes/class-convertkit-api.php:308 +msgid "sequence_subscribe(): the email parameter is empty." +msgstr "" + +#: includes/class-convertkit-api.php:376 +#: includes/class-convertkit-api.php:380 msgid "No tags exist in ConvertKit. Visit your ConvertKit account and create your first tag." msgstr "" +#: includes/class-convertkit-api.php:413 +msgid "tag_subscribe(): the tag_id parameter is empty." +msgstr "" + +#: includes/class-convertkit-api.php:416 +msgid "tag_subscribe(): the email parameter is empty." +msgstr "" + +#: includes/class-convertkit-api.php:471 +msgid "get_subscriber_by_email(): the email parameter is empty." +msgstr "" + #. translators: Email Address -#: includes/class-convertkit-api.php:420 +#: includes/class-convertkit-api.php:495 msgid "No subscriber(s) exist in ConvertKit matching the email address %s." msgstr "" +#: includes/class-convertkit-api.php:526 +msgid "get_subscriber_by_id(): the subscriber_id parameter is empty." +msgstr "" + #. translators: Subscriber ID -#: includes/class-convertkit-api.php:466 +#: includes/class-convertkit-api.php:549 msgid "No subscriber exist in ConvertKit matching the subscriber ID %s." msgstr "" +#: includes/class-convertkit-api.php:580 +msgid "get_subscriber_tags(): the subscriber_id parameter is empty." +msgstr "" + #. translators: Subscriber ID -#: includes/class-convertkit-api.php:512 +#: includes/class-convertkit-api.php:603 msgid "No tags exist in ConvertKit for the subscriber ID %s." msgstr "" +#: includes/class-convertkit-api.php:657 +msgid "unsubscribe(): the email parameter is empty." +msgstr "" + +#: includes/class-convertkit-api.php:719 +#: includes/class-convertkit-api.php:723 +msgid "No custom fields exist in ConvertKit. Visit your ConvertKit account and create your first custom field." +msgstr "" + #. translators: API Error Message -#: includes/class-convertkit-api.php:774 +#: includes/class-convertkit-api.php:959 msgid "ConvertKit: %s" msgstr "" -#: includes/class-convertkit-api.php:912 +#: includes/class-convertkit-api.php:1097 msgid "No forms exist in ConvertKit. Visit your ConvertKit account and create your first form." msgstr "" -#: includes/class-convertkit-api.php:1030 +#: includes/class-convertkit-api.php:1215 msgid "Rate limit hit." msgstr "" diff --git a/readme.txt b/readme.txt index a90245764..72ac3f00d 100755 --- a/readme.txt +++ b/readme.txt @@ -58,6 +58,10 @@ Navigate to the Plugin's Settings at Settings > ConvertKit. == Changelog == +### 1.9.6.9 2022-03-07 +* Added: ConvertKit Form Block: When editing, display the Form Name if a non-inline form has been selected, as non-inline forms cannot be previewed in the editor +* Fix: Include email address in API request when attempting to fetch subscriber ID by email when ConvertKit Form is submitted with no email address + ### 1.9.6.8 2022-02-18 * Fix: Performance: Don't query API to fetch subscriber ID by email when ConvertKit Form is submitted with no email address diff --git a/wp-convertkit.php b/wp-convertkit.php index 908d938c1..ac75987e3 100644 --- a/wp-convertkit.php +++ b/wp-convertkit.php @@ -9,7 +9,7 @@ * Plugin Name: ConvertKit * Plugin URI: https://convertkit.com/ * Description: Quickly and easily integrate ConvertKit forms into your site. - * Version: 1.9.6.8 + * Version: 1.9.6.9 * Author: ConvertKit * Author URI: https://convertkit.com/ * Text Domain: convertkit @@ -24,7 +24,7 @@ define( 'CONVERTKIT_PLUGIN_FILE', plugin_basename( __FILE__ ) ); define( 'CONVERTKIT_PLUGIN_URL', plugin_dir_url( __FILE__ ) ); define( 'CONVERTKIT_PLUGIN_PATH', __DIR__ ); -define( 'CONVERTKIT_PLUGIN_VERSION', '1.9.6.8' ); +define( 'CONVERTKIT_PLUGIN_VERSION', '1.9.6.9' ); // Load files that are always required. require_once CONVERTKIT_PLUGIN_PATH . '/includes/functions.php';