Cannot use NoticeListemItem as type-hint as NoticeListItemAdapter exists.

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

diff --git a/lib/groupminilist.php b/lib/groupminilist.php
index 8e3d2a70ce0bde59327f0b9ae654429c9ebb09ac..8212b81b17965f57e2dbd31f6ef86c721b9b300b 100644 (file)
--- a/lib/groupminilist.php
+++ b/lib/groupminilist.php
@@ -33,8 +33,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
 
 require_once INSTALLDIR.'/lib/grouplist.php';
 
-define('GROUPS_PER_MINILIST', 8);
-
 /**
  * Widget to show a list of groups, good for sidebar
  *
@@ -67,13 +65,11 @@ class GroupMiniList extends GroupList
 
     function showGroup()
     {
-        $this->out->elementStart('li', 'vcard');
-        $this->out->elementStart('a', array('title' => ($this->group->fullname) ?
-                                       $this->group->fullname :
-                                       $this->group->nickname,
+        $this->out->elementStart('li', 'h-card');
+        $this->out->elementStart('a', array('title' => $this->group->getBestName(),
                                        'href' => $this->group->homeUrl(),
                                        'rel' => 'contact group',
-                                       'class' => 'url'));
+                                       'class' => 'p-name u-url org'));
 
         $logo = ($this->group->mini_logo) ?
           $this->group->mini_logo : User_group::defaultLogo(AVATAR_MINI_SIZE);
@@ -82,10 +78,7 @@ class GroupMiniList extends GroupList
                                     'width' => AVATAR_MINI_SIZE,
                                     'height' => AVATAR_MINI_SIZE,
                                     'class' => 'avatar photo',
-                                    'alt' =>  ($this->group->fullname) ?
-                                    $this->group->fullname :
-                                    $this->group->nickname));
-        $this->out->element('span', 'fn org nickname', $this->group->nickname);
+                                    'alt' => $this->group->getBestName()));
         $this->out->elementEnd('a');
         $this->out->elementEnd('li');
     }