Fix category dependent required field validation (#1664)

sovware · Nov 22, 2023 · fdd9ae4 · fdd9ae4
1 parent 8e0be4c
commit fdd9ae4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/includes/classes/class-add-listing.php b/includes/classes/class-add-listing.php
@@ -754,7 +754,7 @@ public static function is_field_submission_empty( $field, $posted_data ) {
 		public static function validate_field( $field, $posted_data ) {
 			$should_validate = (bool) apply_filters( 'atbdp_add_listing_form_validation_logic', true, $field->get_props(), $posted_data );
 
-			if ( $field->is_category_only() && ! in_array( $field->get_assigned_category(), self::$selected_categories, true ) ) {
+			if ( is_null( self::$selected_categories ) || ( $field->is_category_only() && ! in_array( $field->get_assigned_category(), self::$selected_categories, true ) ) ) {
 				$should_validate = false;
 			}
 

diff --git a/includes/directorist-directory-functions.php b/includes/directorist-directory-functions.php
@@ -63,7 +63,9 @@ function directorist_get_listing_form_field( $directory_id, $field_key = '' ) {
 		return array();
 	}
 
-	return directorist_get_listing_form_fields( $directory_id )[ $field_key ] ?: array();
+	$form_fields = directorist_get_listing_form_fields( $directory_id );
+
+	return empty( $form_fields[ $field_key ] ) ? array() : $form_fields[ $field_key ];
 }
 
 function directorist_get_listing_form_category_field( int $directory_id ) {