Merge branch 'master' of https://github.com/DiscipleTools/disciple-tools-webform

Author: ChrisChasm

disciple-tools-webform.php

@@ -3,7 +3,7 @@
  *Plugin Name: Disciple.Tools - Webform
  * Plugin URI: https://github.com/DiscipleTools/disciple-tools-webform
  * Description: Build forms for you websites. Submitted forms will create contacts in Disciple.Tools.
- * Version: 6.6.2
+ * Version: 6.6.3
  * Text Domain: disciple-tools-webform
  * Domain Path: /languages
  * Author name: Disciple.Tools

dt-mapping/class-migration-engine.php

@@ -144,7 +144,7 @@ public static function get_current_db_migration(){
 
 class DT_Mapping_Module_Migration_Lock_Exception extends Exception
 {
-    public function __construct( $message = null, $code = 0, Exception $previous = null ) {
+    public function __construct( $message = null, $code = 0, ?Exception $previous = null ) {
         /*
          * Instead of throwing a simple exception that the migration lock is
          * held, it would be good for the user to if there any previous errors,

dt-mapping/geocode-api/location-grid-geocoder.php

@@ -642,7 +642,7 @@ public function query_level_by_lnglat( float $longitude, float $latitude, int $l
             return $query;
         }
 
-        public function query_lowest_level_by_lnglat( float $longitude, float $latitude, string $country_code = null ): array {
+        public function query_lowest_level_by_lnglat( float $longitude, float $latitude, ?string $country_code = null ): array {
             global $wpdb;
 
             if ( is_null( $country_code ) ) {

dt-mapping/location-grid-meta.php

@@ -168,7 +168,7 @@ public static function add_location_grid_meta( $post_id, array $location_grid_me
             return $wpdb->insert_id;
         }
 
-        public static function delete_location_grid_meta( int $post_id, $type, int $value, array $existing_post = null ) {
+        public static function delete_location_grid_meta( int $post_id, $type, int $value, ?array $existing_post = null ) {
             global $wpdb;
 
             $status = false;
@@ -274,7 +274,7 @@ public static function add_user_location_grid_meta( $user_id, $location_grid_met
             return $wpdb->insert_id;
         }
 
-        public static function delete_user_location_grid_meta( int $user_id, $type, $grid_meta_id, array $existing_post = null ) {
+        public static function delete_user_location_grid_meta( int $user_id, $type, $grid_meta_id, ?array $existing_post = null ) {
             global $wpdb;
 
             $status = false;

dt-mapping/migrations/0006-add-grid-to-db.php

@@ -56,7 +56,7 @@ public function up() {
                 $line = fgets( $fp, 2048 );
                 $count++;
 
-                $data = str_getcsv( $line, "\t" );
+                $data = str_getcsv( $line, "\t", '"', '\\' );
 
                 $data_sql = dt_array_to_sql( $data );
 

includes/class-migration-engine.php

@@ -140,7 +140,7 @@ protected static function sanity_check_expected_tables( array $expected_tables )
 
 class DT_Webform_Migration_Lock_Exception extends Exception
 {
-    public function __construct( $message = null, $code = 0, Exception $previous = null ) {
+    public function __construct( $message = null, $code = 0, ?Exception $previous = null ) {
         /*
          * Instead of throwing a simple exception that the migration lock is
          * held, it would be good for the user to if there any previous errors,

includes/utilities.php

@@ -128,7 +128,7 @@ public static function get_contact_defaults( $force = false ) {
         }
     }
 
-    public static function get_theme( string $theme = 'wide-heavy', string $token = null ) {
+    public static function get_theme( string $theme = 'wide-heavy', ?string $token = null ) {
 
         $meta = self::get_form_meta( $token );
         if ( empty( $meta ) ) {

version-control.json

@@ -1,7 +1,7 @@
 {
   "name": "Disciple.Tools - Webform",
-  "version": "6.6.2",
-  "last_updated": "2024-12",
+  "version": "6.6.3",
+  "last_updated": "2025-06",
   "author": "Disciple.Tools",
   "author_homepage": "https://disciple.tools",
   "git_owner": "DiscipleTools",