From a099d9ff8348b7c2a7ad91a7b22058514055e7a1 Mon Sep 17 00:00:00 2001
From: Robin Cornett <hello@robincornett.com>
Date: Sun, 19 May 2019 14:03:18 -0400
Subject: [PATCH] Move user profile error to image validation class

---
 ...lass-displayfeaturedimagegenesis-author.php | 18 ------------------
 ...redimagegenesis-settings-validate-image.php | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/includes/meta/class-displayfeaturedimagegenesis-author.php b/includes/meta/class-displayfeaturedimagegenesis-author.php
index 5d7d26f..658c9d7 100644
--- a/includes/meta/class-displayfeaturedimagegenesis-author.php
+++ b/includes/meta/class-displayfeaturedimagegenesis-author.php
@@ -83,25 +83,7 @@ class Display_Featured_Image_Genesis_Author extends Display_Featured_Image_Genes
 			$validator = new DisplayFeaturedImageGenesisSettingsValidateImage();
 			$new_value = $validator->validate_image( $new_value, $old_value, $user_object->display_name, $medium );
 
-			//TODO: check if this is set to fire
-			add_filter( 'user_profile_update_errors', array( $this, 'user_profile_error_message' ), 10, 3 );
 			update_user_meta( $user_id, $this->name, $new_value );
 		}
 	}
-
-	/**
-	 * User profile error message
-	 *
-	 * @param object  $errors error message depending on what's wrong
-	 * @param bool    $update whether or not to update
-	 * @param  object $user   user being updated
-	 *
-	 * @since 2.3.0
-	 */
-	public function user_profile_error_message( $errors, $update, $user ) {
-		/* translators: the user display name */
-		$reset = sprintf( __( ' The %s Featured Image has been reset to the last valid setting.', 'display-featured-image-genesis' ), $user->display_name );
-
-		$errors->add( 'profile_error', $reset );
-	}
 }
diff --git a/includes/settings/class-displayfeaturedimagegenesis-settings-validate-image.php b/includes/settings/class-displayfeaturedimagegenesis-settings-validate-image.php
index a07cfa7..2f48047 100644
--- a/includes/settings/class-displayfeaturedimagegenesis-settings-validate-image.php
+++ b/includes/settings/class-displayfeaturedimagegenesis-settings-validate-image.php
@@ -42,6 +42,7 @@ class DisplayFeaturedImageGenesisSettingsValidateImage {
 				esc_attr( $message ),
 				'error'
 			);
+			add_filter( 'user_profile_update_errors', array( $this, 'user_profile_error_message' ), 10, 3 );
 		} elseif ( method_exists( 'WP_Customize_Setting', 'validate' ) ) {
 			return new WP_Error( esc_attr( $class ), esc_attr( $message ) );
 		}
@@ -74,6 +75,22 @@ class DisplayFeaturedImageGenesisSettingsValidateImage {
 		return $message;
 	}
 
+	/**
+	 * User profile error message
+	 *
+	 * @param object  $errors        error message depending on what's wrong
+	 * @param bool    $existing_user existing user
+	 * @param object  $user          user being updated
+	 *
+	 * @since 2.3.0
+	 */
+	public function user_profile_error_message( $errors, $existing_user, $user ) {
+		/* translators: the user display name */
+		$reset = sprintf( __( ' The %s Featured Image has been reset to the last valid setting.', 'display-featured-image-genesis' ), $user->display_name );
+
+		$errors->add( 'profile_error', $reset );
+	}
+
 	/**
 	 * check if file type is image. updated to use WP function.
 	 * @return bool