Changeset 9455 for trunk/src/bp-core/bp-core-avatars.php

Timestamp:

02/09/2015 09:25:56 AM (11 years ago)

Author:

djpaul

Message:

Core: use //www.gravatar.com for all image links.

www.gravatar.com supports HTTP and HTTPs, and by switching to protocol-relative URLs, we can simply the code by removing a number of is_ssl() checks.

Fixes #6135

File:

• trunk/src/bp-core/bp-core-avatars.php (modified) (3 diffs)

trunk/src/bp-core/bp-core-avatars.php

@@ -457 +457 @@
         }
 
-        // Set host based on if using ssl
-        $host = 'http://gravatar.com/avatar/';
-        if ( is_ssl() ) {
-            $host = 'https://secure.gravatar.com/avatar/';
-        }
+        $host = '//www.gravatar.com/avatar/';
 
         // Filter gravatar vars
@@ -1167 +1163 @@
     // Use Gravatar's mystery man as fallback
     } else {
-        if ( is_ssl() ) {
-            $host = 'https://secure.gravatar.com';
-        } else {
-            $host = 'http://www.gravatar.com';
-        }
-
-        $avatar = $host . '/avatar/00000000000000000000000000000000?d=mm&s=' . bp_core_avatar_full_width();
+        $avatar = '//www.gravatar.com/avatar/00000000000000000000000000000000?d=mm&s=' . bp_core_avatar_full_width();
     }
 
@@ -1203 +1193 @@
     // Use Gravatar's mystery man as fallback
     } else {
-        if ( is_ssl() ) {
-            $host = 'https://secure.gravatar.com';
-        } else {
-            $host = 'http://www.gravatar.com';
-        }
-
-        $avatar = $host . '/avatar/00000000000000000000000000000000?d=mm&s=' . bp_core_avatar_thumb_width();
+        $avatar = '//www.gravatar.com/avatar/00000000000000000000000000000000?d=mm&s=' . bp_core_avatar_thumb_width();
     }