summaryrefslogtreecommitdiff
path: root/lib/grouplist.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/grouplist.php')
-rw-r--r--lib/grouplist.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/grouplist.php b/lib/grouplist.php
index 629bdd05d..1b8547499 100644
--- a/lib/grouplist.php
+++ b/lib/grouplist.php
@@ -124,7 +124,7 @@ class GroupList extends Widget
if ($this->group->location) {
$this->out->elementStart('dl', 'entity_location');
$this->out->element('dt', null, _('Location'));
- $this->out->elementStart('dd', 'location');
+ $this->out->elementStart('dd', 'label');
$this->out->raw($this->highlight($this->group->location));
$this->out->elementEnd('dd');
$this->out->elementEnd('dl');
@@ -151,13 +151,16 @@ class GroupList extends Widget
# If we're on a list with an owner (subscriptions or subscribers)...
- if ($user && $user->id == $this->owner->id) {
+ if (!empty($user) && !empty($this->owner) && $user->id == $this->owner->id) {
$this->showOwnerControls();
}
$this->out->elementEnd('div');
if ($user) {
+ $this->out->elementStart('div', 'entity_actions');
+ $this->out->elementStart('ul');
+ $this->out->elementStart('li', 'entity_subscribe');
# XXX: special-case for user looking at own
# subscriptions page
if ($user->isMember($this->group)) {
@@ -167,6 +170,9 @@ class GroupList extends Widget
$jf = new JoinForm($this->out, $this->group);
$jf->show();
}
+ $this->out->elementEnd('li');
+ $this->out->elementEnd('ul');
+ $this->out->elementEnd('div');
}
$this->out->elementEnd('li');