Changeset 3112689

Timestamp:

07/04/2024 04:12:08 PM (21 months ago)

Author:

samuelaguilera

Message:

1.5.2

• Added support for the conversational_form post type introduced in the Conversational Forms add-on 1.3.0 version.
• Moved check for force options (setting and filter) to an earlier stage.

Location:

fresh-forms-for-gravity/trunk

Files:

• class-fresh-forms-for-gravity.php (modified) (2 diffs)
• fresh-forms-for-gravity.php (modified) (2 diffs)
• readme.txt (modified) (3 diffs)

fresh-forms-for-gravity/trunk/class-fresh-forms-for-gravity.php

@@ -349 +349 @@
         }
 
-        // Allow forcing Fresh Form run for certain post ID's without doing the checkings.
-        $force_has_form = $this->get_plugin_setting( 'force_has_form' ) ? $this->get_plugin_setting( 'force_has_form' ) : '';
-        // Remove any empty spaces and convert to array.
-        $force_has_form = array_map( 'intval', explode( ',', preg_replace( '/\s+/', '', $force_has_form ) ) );
-
-        $post_has_gform = apply_filters( 'freshforms_post_has_gform', $force_has_form );
-
-        if ( ! empty( $post_has_gform ) && in_array( $post->ID, $post_has_gform, true ) ) {
-            $this->log_debug( __METHOD__ . "(): Form detection forced to return true by setting or filter for post ID {$post->ID}." );
-            return true;
-        }
-
         // Check for GF shortcode.
         if ( true === $this->find_gf_shortcode( $post->post_content ) ) {
@@ -733 +721 @@
         }
 
+        // Allow forcing Fresh Form run for certain post ID's without doing the checkings.
+        $force_has_form = $this->get_plugin_setting( 'force_has_form' ) ? $this->get_plugin_setting( 'force_has_form' ) : '';
+        // Remove any empty spaces and convert to array.
+        $force_has_form = array_map( 'intval', explode( ',', preg_replace( '/\s+/', '', $force_has_form ) ) );
+        // Allow settings to be filtered.
+        $force_has_form = apply_filters( 'freshforms_post_has_gform', $force_has_form );
+
+        // Exclude posts if any ID was provided.
+        if ( ! empty( $force_has_form ) && in_array( $post_id, $force_has_form, true ) ) {
+            $this->log_debug( __METHOD__ . "(): Form detection forced to return true by setting or filter for post ID {$post_id}." );
+            return true;
+        }
+
+        // Get the post_type for Conversational Forms check.
+        $post_type = get_post_type( $post_id );
+        $this->log_debug( __METHOD__ . "(): Post Type is {$post_type}" );
+
+        // Exclude Conversational Forms pages.
+        if ( ! empty( $post_type ) && 'conversational_form' === $post_type ) {
+            $this->log_debug( __METHOD__ . '(): Conversational Forms page detected!' );
+            return true;
+        }
+
+        // Now we want the full post.
         $post = get_post( $post_id );
 

fresh-forms-for-gravity/trunk/fresh-forms-for-gravity.php

@@ -4 +4 @@
  * Description: Prevent supported caching and JS optimization plugins breaking Gravity Forms.
  * Author: Samuel Aguilera
- * Version: 1.5
+ * Version: 1.5.2
  * Author URI: https://www.samuelaguilera.com
  * Text Domain: fresh-forms-for-gravity
@@ -27 +27 @@
 */
 
-define( 'FRESH_FORMS_FOR_GRAVITY_VERSION', '1.5' );
+define( 'FRESH_FORMS_FOR_GRAVITY_VERSION', '1.5.2' );
 
 // Scripts handlers for plugins using them for exclusion filters (e.g. SG Optimizer or Hummingbird). - Defined here to allow WordPress functions to access them.

fresh-forms-for-gravity/trunk/readme.txt

@@ -3 +3 @@
 Tags: Gravity Forms, gravityforms, cache, caching
 Requires at least: 4.9
-Tested up to: 6.5.4
-Stable tag: 1.5
+Tested up to: 6.5.5
+Stable tag: 1.5.2
 Requires PHP: 7.0
 License: GPLv3
@@ -29 +29 @@
 * **Avada**. The following elements has been proven to work: Content Boxes, "Gravity Form", Modal, Text Block. Other elements could work too, but not tested.
 * **Beaver Builder**. It will detect Gravity Forms shortcodes added to a Text Editor module.
+* **Conversational Forms** add-on. It will automatically detect any form page using the **conversational_form** post type (requires Conversational Forms add-on 1.3.0+).
 * **Divi**. It should work with any of the default modules where you can insert a GF shortcode into the content. e.g. Call To Action, Text, Tabs...
 * **Elementor**. The following widgets added to the post content are supported: Shortcode, Text.
@@ -163 +164 @@
 == Changelog ==
 
+= 1.5.2 =
+
+* Added support for the conversational_form post type introduced in the Conversational Forms add-on 1.3.0 version.
+* Moved check for force options (setting and filter) to an earlier stage.
+
 = 1.5 =