Merge pull request #768 from wpdev10/master

Delete account field with default key was not deleting column

admin/settings/class-formbuilder.php

@@ -2672,11 +2672,6 @@ public function admin_form_field_delete( $field_id = '', $delete_meta = true, $f
                     return $field_id;
                 }
 
-				$wpdb->query( $wpdb->prepare( "delete from " . $table_name . " where id= %d AND form_id = %d", array( $cf, $form_id ) ) );
-
-				// Also delete register form field
-				$wpdb->query( $wpdb->prepare( "delete from " . $extras_table_name . " where site_htmlvar_name= %s AND form_id = %d ", array( $field->htmlvar_name, $form_id ) ) );
-
 			    // delete the meta column
 				if ( isset($field->htmlvar_name) && $delete_meta ) {
 					$register_forms = uwp_get_option( 'multiple_registration_forms' );
@@ -2695,14 +2690,19 @@ public function admin_form_field_delete( $field_id = '', $delete_meta = true, $f
 						}
 					}
 
-					if(isset($custom_fields) && !empty($custom_fields) && count($custom_fields) > 0){
+					if(isset($custom_fields) && !empty($custom_fields) && count($custom_fields) > 1){
                         // Do not delete user meta column if field used in more than one form.
                     } else {
 						$col_name = sanitize_sql_orderby( $field->htmlvar_name );
-						$wpdb->query( "ALTER TABLE `{$meta_table}` DROP COLUMN $col_name" );
+						$wpdb->query( "ALTER TABLE `{$meta_table}` DROP COLUMN `{$col_name}`" );
                     }
 				}
 
+                $wpdb->query( $wpdb->prepare( "delete from " . $table_name . " where id= %d AND form_id = %d", array( $cf, $form_id ) ) );
+
+                // Also delete register form field
+                $wpdb->query( $wpdb->prepare( "delete from " . $extras_table_name . " where site_htmlvar_name= %s AND form_id = %d ", array( $field->htmlvar_name, $form_id ) ) );
+
 				do_action( 'uwp_after_custom_field_deleted', $cf, $field );
 
 				return $field_id;

readme.txt

@@ -148,6 +148,7 @@ Yes, you can customize it with Elementor, but also with Gutenberg, Divi, Beaver
 
 = 1.2.20 - TBD =
 * Elementor compatibility error on Events demo site import - FIXED
+* Delete account field with default key was not deleting column from our usermeta table  - FIXED
 
 = 1.2.19 - 2024-09-06 =
 * Theme customize AyeCode UI colors settings not working after update - FIXED