GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Group listing in Directory plugin works again

Browse Source
This commit is contained in:
Mikael Nordfeldth 2014-06-23 19:02:47 +02:00
parent faa12e63c0
commit abcbca5a94
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/Directory/lib/sortablegrouplist.php
View File

@ -167,12 +167,13 @@ class SortableGroupListItem extends SortableSubscriptionListItem
} }
// TODO: Make sure we can do ->getAvatar() for group profiles too!
function showAvatar(Profile $profile, $size=null) function showAvatar(Profile $profile, $size=null)
{ {
$logo = $profile->getGroup()->stream_logo ?: User_group::defaultLogo($size ?: $this->avatarSize()); $logo = $profile->getGroup()->stream_logo ?: User_group::defaultLogo($size ?: $this->avatarSize());
$this->out->element('img', array('src' => $logo, $this->out->element('img', array('src' => $logo,
'class' => 'photo avatar', 'class' => 'avatar u-photo',
'width' => AVATAR_STREAM_SIZE, 'width' => AVATAR_STREAM_SIZE,
'height' => AVATAR_STREAM_SIZE, 'height' => AVATAR_STREAM_SIZE,
'alt' => $profile->getBestName())); 'alt' => $profile->getBestName()));
@ -205,14 +206,11 @@ class SortableGroupListItem extends SortableSubscriptionListItem
{ {
$this->startProfile(); $this->startProfile();
$this->out->elementStart('a', array('href' => $this->profile->homeUrl(),
'class' => 'h-card p-org p-nickname',
'rel' => 'contact group'));
// getProfile here is because $this->profile is a User_group, which it should stop
// being by making sure the group listing runs a ->getGroup when it's necessary.
$this->showAvatar($this->profile->getProfile()); $this->showAvatar($this->profile->getProfile());
$this->out->text($this->profile->getNickname()); $this->out->element('a', array('href' => $this->profile->homeUrl(),
$this->out->elementEnd('a'); 'class' => 'p-org p-nickname',
'rel' => 'contact group'),
$this->profile->getNickname());
$this->showFullName(); $this->showFullName();
$this->showLocation(); $this->showLocation();

2
plugins/ModPlus/ModPlusPlugin.php
View File

@ -99,7 +99,7 @@ class ModPlusPlugin extends Plugin
*/ */
function onStartProfileListItemProfile($item) function onStartProfileListItemProfile($item)
{ {
$this->showProfileOptions($item->out, $item->profile); $this->showProfileOptions($item->out, $item->profile->getProfile());
return true; return true;
} }