Merge branch '0.9.x' into tinymce

1 files changed, 31 insertions, 15 deletions

diff --git a/lib/profileminilist.php b/lib/profileminilist.php
index 079170d80..a98953474 100644
--- a/lib/profileminilist.php
+++ b/lib/profileminilist.php
@@ -81,20 +81,36 @@ class ProfileMiniListItem extends ProfileListItem
     function show()
     {
         $this->out->elementStart('li', 'vcard');
-        $this->out->elementStart('a', array('title' => $this->profile->getBestName(),
-                                       'href' => $this->profile->profileurl,
-                                       'rel' => 'contact member',
-                                       'class' => 'url'));
-        $avatar = $this->profile->getAvatar(AVATAR_MINI_SIZE);
-        $this->out->element('img', array('src' => (($avatar) ? $avatar->displayUrl() :  Avatar::defaultImage(AVATAR_MINI_SIZE)),
-                                    'width' => AVATAR_MINI_SIZE,
-                                    'height' => AVATAR_MINI_SIZE,
-                                    'class' => 'avatar photo',
-                                    'alt' =>  ($this->profile->fullname) ?
-                                    $this->profile->fullname :
-                                    $this->profile->nickname));
-        $this->out->element('span', 'fn nickname', $this->profile->nickname);
-        $this->out->elementEnd('a');
-        $this->out->elementEnd('li');
+        if (Event::handle('StartProfileListItemProfileElements', array($this))) {
+            if (Event::handle('StartProfileListItemAvatar', array($this))) {
+                $aAttrs = $this->linkAttributes();
+                $this->out->elementStart('a', $aAttrs);
+                $avatar = $this->profile->getAvatar(AVATAR_MINI_SIZE);
+                $this->out->element('img', array('src' => (($avatar) ? $avatar->displayUrl() :  Avatar::defaultImage(AVATAR_MINI_SIZE)),
+                                                 'width' => AVATAR_MINI_SIZE,
+                                                 'height' => AVATAR_MINI_SIZE,
+                                                 'class' => 'avatar photo',
+                                                 'alt' =>  ($this->profile->fullname) ?
+                                                 $this->profile->fullname :
+                                                 $this->profile->nickname));
+                $this->out->element('span', 'fn nickname', $this->profile->nickname);
+                $this->out->elementEnd('a');
+                Event::handle('EndProfileListItemAvatar', array($this));
+            }
+            $this->out->elementEnd('li');
+        }
+    }
+
+    // default; overridden for nofollow lists
+
+    function linkAttributes()
+    {
+        $aAttrs = parent::linkAttributes();
+
+        $aAttrs['title'] = $this->profile->getBestName();
+        $aAttrs['rel']   = 'contact member'; // @todo: member? always?
+        $aAttrs['class'] = 'url';
+
+        return $aAttrs;
     }
 }