From 81d39fd9c4773ec5e449e824946fd68e88b3f071 Mon Sep 17 00:00:00 2001
From: champsupertramp <heychampsupertramp@gmail.com>
Date: Mon, 7 Mar 2016 19:12:07 +0800
Subject: [PATCH] Add option to change Gravatar default image

---
 core/um-filters-avatars.php |  4 +++-
 core/um-short-functions.php |  4 +++-
 um-config.php               | 11 +++++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/core/um-filters-avatars.php b/core/um-filters-avatars.php
index 81584bd7..c58d5ca5 100644
--- a/core/um-filters-avatars.php
+++ b/core/um-filters-avatars.php
@@ -43,7 +43,9 @@
 			if( um_get_option('use_gravatars') && ! um_user('synced_profile_photo') && ! $has_profile_photo ){
 						$avatar_url  = um_get_domain_protocol().'gravatar.com/avatar/'.um_user('synced_gravatar_hashed_id');
 						$avatar_url = add_query_arg('s',400, $avatar_url);
-						$avatar_url = add_query_arg('d', um_get_default_avatar_uri(), $avatar_url  );
+						if( um_get_option('use_um_gravatar_default_image') ){
+							$avatar_url = add_query_arg('d', um_get_default_avatar_uri(), $avatar_url  );
+						}
 			}
 			
 			$avatar = '<img src="' .$avatar_url .'?d='. $default . '&amp;s=' . $size . $rating .'" class="func-um_get_avatar gravatar avatar avatar-'.$size.' um-avatar" width="'.$size.'" height="'.$size.'" alt="" />';
diff --git a/core/um-short-functions.php b/core/um-short-functions.php
index a9ab3540..837b3bef 100644
--- a/core/um-short-functions.php
+++ b/core/um-short-functions.php
@@ -1433,7 +1433,9 @@ function um_fetch_user( $user_id ) {
 					if( um_get_option('use_gravatars') && ! um_user('synced_profile_photo') && ! $has_profile_photo ){
 						$avatar_uri  = um_get_domain_protocol().'gravatar.com/avatar/'.um_user('synced_gravatar_hashed_id');
 						$avatar_uri = add_query_arg('s',400, $avatar_uri);
-						$avatar_uri = add_query_arg('d', um_get_default_avatar_uri(), $avatar_uri  );
+						if( um_get_option('use_um_gravatar_default_image') ){
+							$avatar_uri = add_query_arg('d', um_get_default_avatar_uri(), $avatar_uri  );
+						}
 					}
 
 					return '<img src="' . $avatar_uri . '" class="func-um_user gravatar avatar avatar-'.$attrs.' um-avatar" width="'.$attrs.'" height="'.$attrs.'" alt="" />';
diff --git a/um-config.php b/um-config.php
index ccf798f8..c833e65d 100644
--- a/um-config.php
+++ b/um-config.php
@@ -177,6 +177,17 @@ $this->sections[] = array(
 				'off'			=> __('No','ultimatemember'),
         ),
 
+        array(
+                'id'       		=> 'use_um_gravatar_default_image',
+                'type'     		=> 'switch',
+                'title'   		=> __( 'Use Default plugin avatar as Gravatar\'s Default avatar','ultimatemember' ),
+				'default' 		=> 0,
+				'desc' 	   		=> __('Do you want to use the plugin default avatar instead of the gravatar default photo (If the user did not upload a custom profile photo / avatar)','ultimatemember'),
+				'on'			=> __('Yes','ultimatemember'),
+				'off'			=> __('No','ultimatemember'),
+				'required'		=> array( 'use_gravatars', '=', 1 ),
+        ),
+
         array(
                 'id'       		=> 'reset_require_strongpass',
                 'type'     		=> 'switch',