Merge branch 'hotfix/fatal-error-legacy-forms-7057'

give.php

@@ -6,7 +6,7 @@
  * Description: The most robust, flexible, and intuitive way to accept donations on WordPress.
  * Author: GiveWP
  * Author URI: https://givewp.com/
- * Version: 3.0.2
+ * Version: 3.0.3
  * Requires at least: 6.0
  * Requires PHP: 7.2
  * Text Domain: give
@@ -391,7 +391,7 @@ private function setup_constants()
     {
         // Plugin version.
         if (!defined('GIVE_VERSION')) {
-            define('GIVE_VERSION', '3.0.2');
+            define('GIVE_VERSION', '3.0.1');
         }
 
         // Plugin Root File.

readme.txt

@@ -5,7 +5,7 @@ Tags: donation, donate, recurring donations, fundraising, crowdfunding
 Requires at least: 6.0
 Tested up to: 6.4
 Requires PHP: 7.2
-Stable tag: 3.0.2
+Stable tag: 3.0.3
 License: GPLv3
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
 
@@ -262,10 +262,6 @@ The 2% fee on Stripe donations only applies to donations taken via our free Stri
 10. Use almost any payment gateway integration with GiveWP through our add-ons or by creating your own add-on.
 
 == Changelog ==
-= 3.0.2: October 19th, 2023 =
-* Fix: Stripe per-form settings are included when migrating a form to the Visual Donation Form Builder
-* Fix: Gateways are properly separated in the settings page and Global Settings for Fee Recovery shows all gateways when you select per gateway
-
 = 3.0.1: October 17th, 2023 =
 * Fix: Resolved a conflict with Matomo plugin that was causing a fatal error
 

src/DonationForms/FormPage/TemplateHandler.php

@@ -2,8 +2,12 @@
 
 namespace Give\DonationForms\FormPage;
 
+use Give\Helpers\Form\Utils;
 use WP_Post as Post;
 
+/**
+ * @since 3.0.0
+ */
 class TemplateHandler
 {
     /**
@@ -22,17 +26,24 @@ public function __construct( $post, string $formPageTemplatePath )
         $this->formPageTemplatePath = $formPageTemplatePath;
     }
 
+    /**
+     * @since 3.0.0
+     */
     public function handle($template)
     {
         return $this->isNextGenForm()
             ? $this->formPageTemplatePath
             : $template;
     }
 
+    /**
+     * @since 3.0.3 Use isV3Form() method instead of 'post_content' to check if the form is built with Visual Builder
+     * @since      3.0.0
+     */
     protected function isNextGenForm(): bool
     {
         return $this->post
-               && $this->post->post_content
-               &&'give_forms' === $this->post->post_type;
+               && Utils::isV3Form($this->post->ID)
+               && 'give_forms' === $this->post->post_type;
     }
 }

src/DonationForms/Repositories/DonationFormRepository.php

@@ -19,6 +19,7 @@
 use Give\Framework\PaymentGateways\PaymentGateway;
 use Give\Framework\PaymentGateways\PaymentGatewayRegister;
 use Give\Framework\Support\Facades\DateTime\Temporal;
+use Give\Helpers\Form\Utils;
 use Give\Helpers\Hooks;
 use Give\Log\Log;
 
@@ -477,13 +478,12 @@ function ($value, Closure $fail, string $key, array $values) use ($formId) {
     }
 
     /**
+     * @since 3.0.3 Use isV3Form() method instead of 'post_content' to check if it's a legacy form
      * @since 3.0.0
      */
     public function isLegacyForm(int $formId): bool
     {
-        $form = DB::table('posts')->select(['post_content', 'data'])->where('ID', $formId)->get();
-
-        return empty($form->data);
+        return ! Utils::isV3Form($formId);
     }
 
     /**

src/FormBuilder/Routes/EditFormRoute.php

@@ -3,13 +3,15 @@
 namespace Give\FormBuilder\Routes;
 
 use Give\FormBuilder\FormBuilderRouteBuilder;
+use Give\Helpers\Form\Utils;
 
 /**
  * Route to edit an existing form
  */
 class EditFormRoute
 {
     /**
+     * @since 3.0.3 Use isV3Form() method instead of 'post_content' to check if the form is built with Visual Builder
      * @since 3.0.0
      *
      * @return void
@@ -18,7 +20,7 @@ public function __invoke()
     {
         if (isset($_GET['post'], $_GET['action']) && 'edit' === $_GET['action']) {
             $post = get_post(abs($_GET['post']));
-            if ('give_forms' === $post->post_type && $post->post_content) {
+            if ('give_forms' === $post->post_type && Utils::isV3Form($post->ID)) {
                 wp_redirect(FormBuilderRouteBuilder::makeEditFormRoute($post->ID));
                 exit();
             }