Merge pull request #1208 from CPAN-API/tsibley/more-gravatar-munging

Munge more Gravatar urls into https submission
metacpan · May 27, 2014 · 328e6d4 · 328e6d4
2 parents 0edd081 + 964250a
commit 328e6d4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/MetaCPAN/Web/View/HTML.pm b/lib/MetaCPAN/Web/View/HTML.pm
@@ -179,7 +179,10 @@ Template::Alloy->define_vmethod(
     'text',
     gravatar_fixup => sub {
         my ( $url, $size ) = @_;
-        if ( $url =~ m{^https?://(secure|www)\.gravatar\.com/avatar/} ) {
+        if ( $url
+            =~ m{^https?://([a-z0-9.-]+\.)?gravatar\.com/(avatar|userimage)/}i
+            )
+        {
             my $url = URI->new($url);
             $url->scheme('https');
             $url->host('secure.gravatar.com');

diff --git a/root/static/js/contributors.js b/root/static/js/contributors.js
@@ -13,8 +13,9 @@ $(function(){
             // TODO make this an :before pseudo-class
             var gravatar = data.gravatar_url;
             gravatar = gravatar.replace( 
-                "^http://(www\.)?gravatar.com/",
-                "https://secure.gravatar.com/"
+                "^https?://([a-z0-9.-]+\.)?gravatar\.com/",
+                "https://secure.gravatar.com/",
+                "i"
             ).replace(
                 /s=\d+/,
                 's=20'