Merge branch 'user-fields-logic-overhaul' of https://github.com/dpark…

…er1005/paid-memberships-pro into user-fields-php-ui
strangerstudios · Nov 7, 2024 · 144376a · 144376a
2 parents a845f0f + 3c73ae1
commit 144376a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/classes/class-pmpro-field.php b/classes/class-pmpro-field.php
@@ -880,7 +880,7 @@ private function getHTML($value = "")
 			$r_end .= "</div>";
 		}
 
-		if ( empty( $value ) && pmpro_is_checkout() ) {
+		if ( '' === $value && pmpro_is_checkout() ) {
 			/**
 			 * Filter to set the default value for a field. The default value will only load if no value is already found.
 			 * 
@@ -894,7 +894,7 @@ private function getHTML($value = "")
 
 		if($this->type == "text")
 		{
-			$r = '<input type="text" id="' . esc_attr( $this->id ) . '" name="' . esc_attr( $this->name ) . '" value="' . esc_attr(wp_unslash($value)) . '" ';
+			$r = '<input type="text" id="' . esc_attr( $this->id ) . '" name="' . esc_attr( $this->name ) . '" value="' . ( is_string( $value ) ? esc_attr(wp_unslash($value) ) : '' ) . '" ';
 			if(!empty($this->size))
 				$r .= 'size="' . esc_attr( $this->size ) . '" ';
 			if(!empty($this->class))
@@ -1120,7 +1120,7 @@ private function getHTML($value = "")
 				$r .= 'readonly="readonly" ';
 			if(!empty($this->html_attributes))
 				$r .= $this->getHTMLAttributes();
-			$r .= '>' . esc_textarea(wp_unslash($value)) . '</textarea>';
+				$r .= '>' . ( ( is_string( $value ) ) ? esc_textarea(wp_unslash($value) ) : '' ) . '</textarea>';
 		}
 		elseif($this->type == "hidden")
 		{

diff --git a/includes/fields.php b/includes/fields.php
@@ -391,7 +391,7 @@ function pmpro_checkout_user_creation_checks_user_fields( $okay ) {
 			}
 
 			// If the field was filled if needed, skip it.
-			if ( empty( $field->was_filled_if_needed() ) ) {
+			if ( $field->was_filled_if_needed() ) {
 				continue;
 			}
 
@@ -491,7 +491,7 @@ function pmpro_registration_checks_for_user_fields( $okay ) {
 			}
 
 			// If the field was filled if needed, skip it.
-			if ( empty( $field->was_filled_if_needed() ) ) {
+			if ( $field->was_filled_if_needed() ) {
 				continue;
 			}