Made the use of gravatar optional

.gitignore

@@ -4,6 +4,7 @@
 *.swp
 *.graffle
 .idea
+*.iml
 
 # Useful files which should never be committed
 src/configs/override.ini

src/configs/defaults.ini

@@ -20,6 +20,7 @@ assetProtocol=""
 displaySignupLink=""
 displaySignupUrl=""
 enableBetaFeatures="0"
+useGravatar=1
 
 [secrets]
 passwordSalt="salt_for_passwords"

src/libraries/models/User.php

@@ -95,8 +95,12 @@ public function getAvatarFromEmail($size = 50, $email = null)
 
     $defaultUrl = sprintf('%s%s', $hostAndProtocol, $this->themeObj->asset('image', 'profile-default.png', false));
 
+    if ($this->config->site->useGravatar == 0)
+        return $defaultUrl;
+
     $hash = md5(strtolower(trim($email)));
-    return sprintf("http://www.gravatar.com/avatar/%s?s=%s&d=%s", $hash, $size, urlencode($defaultUrl));
+    // return without the protocol part, so that we use the same protocol as it's currently being served
+    return sprintf("//www.gravatar.com/avatar/%s?s=%s&d=%s", $hash, $size, urlencode($defaultUrl));
   }
 
   /**