summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-03-23 15:44:17 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-03-23 15:44:17 -0400
commit14afe2d26874ed30a0ccef5e0acda2c5171afcde (patch)
treeed861bb13a086d900a4b6a510bc03cb2cbe4bc6c
parent3070a9597cc72ac6197a6dcf8174fc755b7dfb4a (diff)
show subscribe button and block form again
-rw-r--r--lib/profilelist.php20
1 files changed, 12 insertions, 8 deletions
diff --git a/lib/profilelist.php b/lib/profilelist.php
index bd9b51958..a4cc23555 100644
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -109,7 +109,7 @@ class ProfileList extends Widget
$this->out->elementEnd('span');
$this->out->elementEnd('a');
- if ($this->profile->fullname !== '') {
+ if (!empty($this->profile->fullname)) {
$this->out->elementStart('dl', 'entity_fn');
$this->out->element('dt', null, 'Full name');
$this->out->elementStart('dd');
@@ -119,7 +119,7 @@ class ProfileList extends Widget
$this->out->elementEnd('dd');
$this->out->elementEnd('dl');
}
- if ($this->profile->location !== '') {
+ if (!empty($this->profile->location)) {
$this->out->elementStart('dl', 'entity_location');
$this->out->element('dt', null, _('Location'));
$this->out->elementStart('dd', 'label');
@@ -127,7 +127,7 @@ class ProfileList extends Widget
$this->out->elementEnd('dd');
$this->out->elementEnd('dl');
}
- if ($this->profile->homepage !== '') {
+ if (!empty($this->profile->homepage)) {
$this->out->elementStart('dl', 'entity_url');
$this->out->element('dt', null, _('URL'));
$this->out->elementStart('dd');
@@ -138,7 +138,7 @@ class ProfileList extends Widget
$this->out->elementEnd('dd');
$this->out->elementEnd('dl');
}
- if ($this->profile->bio !== '') {
+ if (!empty($this->profile->bio)) {
$this->out->elementStart('dl', 'entity_note');
$this->out->element('dt', null, _('Note'));
$this->out->elementStart('dd', 'note');
@@ -194,11 +194,12 @@ class ProfileList extends Widget
$this->out->elementStart('ul');
- if (!$is_own) {
- # XXX: special-case for user looking at own
- # subscriptions page
+ // Is this a logged-in user, looking at someone else's
+ // profile?
+
+ if (!empty($user) && $this->profile->id != $user->id) {
$this->out->elementStart('li', 'entity_subscribe');
- if (!is_null($user) && $user->isSubscribed($this->profile)) {
+ if ($user->isSubscribed($this->profile)) {
$usf = new UnsubscribeForm($this->out, $this->profile);
$usf->show();
} else {
@@ -207,6 +208,9 @@ class ProfileList extends Widget
}
$this->out->elementEnd('li');
$this->out->elementStart('li', 'entity_block');
+ if ($user->id == $this->owner->id) {
+ $this->showBlockForm();
+ }
$this->out->elementEnd('li');
}