Merge branch 'master' into social-master

[quix0rs-gnu-social.git] / lib / accountprofileblock.php

diff --git a/lib/accountprofileblock.php b/lib/accountprofileblock.php
index 5d4aba9558cf84d349599d7b6ec6cb61a456826b..fe11a0fc1571c3658fa38253c4073a18aa543127 100644 (file)
--- a/lib/accountprofileblock.php
+++ b/lib/accountprofileblock.php
@@ -51,7 +51,7 @@ class AccountProfileBlock extends ProfileBlock
     protected $profile = null;
     protected $user    = null;
 
-    function __construct(HTMLOutputter $out, Profile $profile)
+    function __construct(Action $out, Profile $profile)
     {
         parent::__construct($out);
         $this->profile = $profile;
@@ -63,11 +63,6 @@ class AccountProfileBlock extends ProfileBlock
         }
     }
 
-    function avatar()
-    {
-        return $this->profile->avatarUrl(AVATAR_PROFILE_SIZE);
-    }
-
     function name()
     {
         return $this->profile->getBestName();
@@ -176,17 +171,6 @@ class AccountProfileBlock extends ProfileBlock
                         $this->out->elementEnd('li');
 
                         if ($this->profile->isLocal() && $cur->mutuallySubscribed($this->profile)) {
-
-                            // message
-
-                            $this->out->elementStart('li', 'entity_send-a-message');
-                            $this->out->element('a', array('href' => common_local_url('newmessage', array('to' => $this->user->id)),
-                                                      // TRANS: Link title for link on user profile.
-                                                      'title' => _('Send a direct message to this user.')),
-                                           // TRANS: Link text for link on user profile.
-                                           _m('BUTTON','Message'));
-                            $this->out->elementEnd('li');
-
                             // nudge
 
                             if ($this->user->email && $this->user->emailnotifynudge) {