Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / plugins / Gravatar / GravatarPlugin.php

diff --git a/plugins/Gravatar/GravatarPlugin.php b/plugins/Gravatar/GravatarPlugin.php
index bdb73f3433b06f966e21a6048f68773d4fe26cda..637674b1db0f7c1c0dd4b421d507cbe1d12764a1 100644 (file)
--- a/plugins/Gravatar/GravatarPlugin.php
+++ b/plugins/Gravatar/GravatarPlugin.php
@@ -30,16 +30,20 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 class GravatarPlugin extends Plugin
 {
-    function onEndProfileGetAvatar($profile, $size, &$avatar)
+    function onEndProfileGetAvatar(Profile $profile, $size, &$avatar)
     {
         if (empty($avatar)) {
-            $user = $profile->getUser();
-            if (!empty($user) && !empty($user->email)) {
-                // Fake one!
-                $avatar = new Avatar();
-                $avatar->width = $avatar->height = $size;
-                $avatar->url = $this->gravatar_url($user->email, $size);
-                return false;
+            try {
+                $user = $profile->getUser();
+                if (!empty($user->email)) {
+                    // Fake one!
+                    $avatar = new Avatar();
+                    $avatar->width = $avatar->height = $size;
+                    $avatar->url = $this->gravatar_url($user->email, $size);
+                    return false;
+                }
+            } catch (NoSuchUserException $e) {
+                return true;
             }
         }
 
@@ -48,17 +52,17 @@ class GravatarPlugin extends Plugin
 
     function gravatar_url($email, $size)
     {
-        $url = "https://secure.gravatar.com/avatar.php?gravatar_id=".
-                md5(strtolower($email)).
-                "&default=".urlencode(Avatar::defaultImage($size)).
-                "&size=".$size;
+        $url = 'https://secure.gravatar.com/avatar.php?gravatar_id=' .
+                md5(strtolower($email)) .
+                '&default=' . urlencode(Avatar::defaultImage($size)) .
+                '&size=' . $size;
             return $url;
     }
 
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Gravatar',
-                            'version' => STATUSNET_VERSION,
+                            'version' => GNUSOCIAL_VERSION,
                             'author' => 'Eric Helgeson, Evan Prodromou',
                             'homepage' => 'http://status.net/wiki/Plugin:Gravatar',
                             'rawdescription' =>