Merge commit 'refs/merge-requests/41' of https://gitorious.org/social/mainline into...

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

diff --git a/lib/profileblock.php b/lib/profileblock.php
index 2a71f284c35c4bdb96e526dc7483a6556cd17256..65c4fa99d2c51ac980eae7ef32079478c7fd014f 100644 (file)
--- a/lib/profileblock.php
+++ b/lib/profileblock.php
@@ -47,7 +47,8 @@ if (!defined('STATUSNET')) {
 
 abstract class ProfileBlock extends Widget
 {
-    abstract function avatar();
+    protected $avatarSize = AVATAR_PROFILE_SIZE;
+
     abstract function name();
     abstract function url();
     abstract function location();
@@ -57,7 +58,7 @@ abstract class ProfileBlock extends Widget
     function show()
     {
         $this->showActions();
-        $this->showAvatar();
+        $this->showAvatar($this->profile);
         $this->showName();
         $this->showLocation();
         $this->showHomepage();
@@ -66,22 +67,6 @@ abstract class ProfileBlock extends Widget
         $this->showTags();
     }
 
-    function showAvatar()
-    {
-        $size = $this->avatarSize();
-
-        $this->out->element(
-            'img',
-            array(
-                'src'  => $this->avatar(),
-                'class'  => 'ur_face',
-                'alt'    => $this->name(),
-                'width'  => $size,
-                'height' => $size
-            )
-        );
-    }
-
     function showName()
     {
         $name = $this->name();
@@ -149,7 +134,7 @@ abstract class ProfileBlock extends Widget
                                          array('href' => $otherProfile['href'],
                                                'rel' => 'me',
                                                'class' => 'profile_block_otherprofile',
-                                               'alt' => $otherProfile['text']));
+                                               'title' => $otherProfile['text']));
                 $this->out->element('img',
                                     array('src' => $otherProfile['image'],
                                           'class' => 'profile_block_otherprofile_icon'));
@@ -161,11 +146,6 @@ abstract class ProfileBlock extends Widget
         }
     }
 
-    function avatarSize()
-    {
-        return AVATAR_PROFILE_SIZE;
-    }
-
     function showTags()
     {
     }