Merge branch 'hotfix/multi-form-goal-shortcode-7060' into develop

give.php

@@ -391,7 +391,7 @@ private function setup_constants()
     {
         // Plugin version.
         if (!defined('GIVE_VERSION')) {
-            define('GIVE_VERSION', '3.0.1');
+            define('GIVE_VERSION', '3.0.2');
         }
 
         // Plugin Root File.

readme.txt

@@ -262,9 +262,13 @@ 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.3: October 20th, 2023 =
-* Fix: Forms no longer have fatal errors on Elementor websites when the Display Content option is enabled
+= 3.0.2: October 19th, 2023 =
+<<<<<<<<< Temporary merge branch 1
+* 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
 
+>>>>>>>>> Temporary merge branch 2
 = 3.0.1: October 17th, 2023 =
 * Fix: Resolved a conflict with Matomo plugin that was causing a fatal error
 

src/MultiFormGoals/ProgressBar/Model.php

@@ -38,6 +38,7 @@ public function __construct(array $args)
     /**
      * Get forms associated with Progress Bar
      *
+     * @since 3.0.3 Return empty array instead of false
      * @since 2.9.0
      */
     public function getForms(): array
@@ -78,7 +79,7 @@ public function getForms(): array
 
             return $query->posts;
         } else {
-            return false;
+            return [];
         }
     }