Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

diff --combined lib/grouplist.php
index 1b854749982198e68f89de742d2c1fd306e3ce1c,8f3b0abd8729fe1dce6649e8230e47b4e2586b3f..8e2637fec9626de9615f6243b2e3cba5dd19acee
--- 1/lib/grouplist.php
--- 2/lib/grouplist.php
+++ b/lib/grouplist.php
@@@ -124,7 -124,7 +124,7 @@@ class GroupList extends Widge
          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,7 -151,7 +151,7 @@@
  
          # 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();
          }
  
@@@ -164,8 -164,10 +164,10 @@@
              # XXX: special-case for user looking at own
              # subscriptions page
              if ($user->isMember($this->group)) {
-                 $lf = new LeaveForm($this->out, $this->group);
-                 $lf->show();
+                 if (!$user->isAdmin($this->group)) {
+                     $lf = new LeaveForm($this->out, $this->group);
+                     $lf->show();
+                 }
              } else {
                  $jf = new JoinForm($this->out, $this->group);
                  $jf->show();