Merge "remote avatars: support for https-based avatars"

htdocs/lib/user.php

@@ -1893,6 +1893,9 @@ function remote_avatar($email, $size, $notfound) {
     }
 
     $baseurl = 'http://www.gravatar.com/avatar/';
+    if (stripos(get_config('wwwroot'), 'https://') === 0) {
+        $baseurl = 'https://secure.gravatar.com/avatar/';
+    }
     if (get_config('remoteavatarbaseurl')) {
         $baseurl = get_config('remoteavatarbaseurl');
     }