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

[quix0rs-gnu-social.git] / actions / avatarbynickname.php

diff --git a/actions/avatarbynickname.php b/actions/avatarbynickname.php
index dc80ec952ed85543650ff8455c8b87aad00b7659..b366c62d80259181ee07f793a2f82ff24461d9d0 100644 (file)
--- a/actions/avatarbynickname.php
+++ b/actions/avatarbynickname.php
@@ -34,7 +34,7 @@ if (!defined('GNUSOCIAL')) { exit(1); }
  * Retrieve user avatar by nickname action class.
  *
  * @category Action
- * @package  GNUSocial
+ * @package  GNUsocial
  * @author   Evan Prodromou <evan@status.net>
  * @author   Robin Millette <millette@status.net>
  * @author   Mikael Nordfeldth <mmn@hethane.se>
@@ -73,9 +73,9 @@ class AvatarbynicknameAction extends Action
 
         if ($size === 'original') {
             try {
-                $avatar = Avatar::getOriginal($profile);
+                $avatar = Avatar::getUploaded($profile);
                 $url = $avatar->displayUrl();
-            } catch (Exception $e) {
+            } catch (NoAvatarException $e) {
                 $url = Avatar::defaultImage(AVATAR_PROFILE_SIZE);
             }
         } else {
@@ -85,7 +85,7 @@ class AvatarbynicknameAction extends Action
         common_redirect($url, 302);
     }
 
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }