Merge branch '0.7.x' into 0.8.x

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

diff --git a/actions/avatarbynickname.php b/actions/avatarbynickname.php
index 9bbdecefac8c9f498cda453dfeb4662cec276d17..e92a993722366ec1c9551857e11a369aec210f6f 100644 (file)
--- a/actions/avatarbynickname.php
+++ b/actions/avatarbynickname.php
@@ -90,15 +90,15 @@ class AvatarbynicknameAction extends Action
             $url = $avatar->url;
         } else {
             if ($size == 'original') {
-                $url = common_default_avatar(AVATAR_PROFILE_SIZE);
+                $url = Avatar::defaultImage(AVATAR_PROFILE_SIZE);
             } else {
-                $url = common_default_avatar($size+0);
+                $url = Avatar::defaultImage($size+0);
             }
         }
         common_redirect($url, 302);
     }
 
-    function isReadOnly()
+    function isReadOnly($args)
     {
         return true;
     }