X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fsubscriptionlist.php;h=aad1f1230b1bdf296bca339821c8233dec45d746;hb=da2f179ae97766b32f84d8180068830a605c9510;hp=fc8f33f2ecee3524caccf5456421379ebf445fb6;hpb=819d33210d298de74b64dc7ead79e9d9b223b12e;p=quix0rs-gnu-social.git
diff --git a/lib/subscriptionlist.php b/lib/subscriptionlist.php
index fc8f33f2ec..aad1f1230b 100644
--- a/lib/subscriptionlist.php
+++ b/lib/subscriptionlist.php
@@ -1,5 +1,4 @@
owner = $owner;
}
- function newListItem($profile)
+ public function newListItem(Profile $profile)
{
return new SubscriptionListItem($profile, $this->owner, $this->action);
}
@@ -78,55 +72,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);
-
- $this->out->elementStart('dl', 'entity_tags');
- $this->out->elementStart('dt');
- if ($this->isOwn()) {
- $this->out->element('a', array('href' => common_local_url('tagother',
- array('id' => $this->profile->id))),
- _('Tags'));
- } else {
- $this->out->text(_('Tags'));
- }
- $this->out->elementEnd('dt');
- $this->out->elementStart('dd');
- if ($tags) {
- $this->out->elementStart('ul', 'tags xoxo');
- 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)'));
- }
- $this->out->elementEnd('dd');
- $this->out->elementEnd('dl');
+ $user = common_current_user();
+ return (!empty($user) && ($this->owner->id == $user->id));
}
}