X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fsubscriptionlist.php;h=f882b90c7f30b6e76094521914986943626ebd40;hb=d6b28c64830f632bb2f4b6f3c9369b9e56ad217a;hp=3ca4603948004536195bca3e04d828dc68df743d;hpb=5c25364141eca62ea99c4f81d55ab592273db518;p=quix0rs-gnu-social.git
diff --git a/lib/subscriptionlist.php b/lib/subscriptionlist.php
index 3ca4603948..f882b90c7f 100644
--- a/lib/subscriptionlist.php
+++ b/lib/subscriptionlist.php
@@ -1,5 +1,4 @@
owner = $owner;
}
- function newListItem($profile)
+ function newListItem(Profile $profile)
{
return new SubscriptionListItem($profile, $this->owner, $this->action);
}
@@ -78,49 +74,28 @@ class SubscriptionListItem extends ProfileListItem
function showProfile()
{
$this->startProfile();
- $this->showAvatar();
+ $this->showAvatar($this->profile);
+ $this->showNickname();
$this->showFullName();
$this->showLocation();
$this->showHomepage();
$this->showBio();
// Relevant portion!
$this->showTags();
+ if ($this->isOwn()) {
+ $this->showOwnerControls();
+ }
$this->endProfile();
}
- function isOwn()
+ function showOwnerControls()
{
- $user = common_current_user();
- return (!empty($user) && ($this->owner->id == $user->id));
+ // pass
}
- function showTags()
+ function isOwn()
{
- $tags = Profile_tag::getTags($this->owner->id, $this->profile->id);
-
- if ($this->isOwn()) {
- $this->out->element('a', array('href' => common_local_url('tagother',
- array('id' => $this->profile->id))),
- _('Tags'));
- } else {
- $this->out->text(_('Tags'));
- }
- if ($tags) {
- $this->out->elementStart('ul', 'tags xoxo entity_tags');
- foreach ($tags as $tag) {
- $this->out->elementStart('li');
- // Avoid space by using raw output.
- $pt = '#' . $tag . '';
- $this->out->raw($pt);
- $this->out->elementEnd('li');
- }
- $this->out->elementEnd('ul');
- } else {
- $this->out->text(_('(None)'));
- }
+ $user = common_current_user();
+ return (!empty($user) && ($this->owner->id == $user->id));
}
}