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

[quix0rs-gnu-social.git] / lib / grouplist.php

diff --git a/lib/grouplist.php b/lib/grouplist.php
index 6801ab42617eb40d876fecccba72066c0c2e2ba4..1b854749982198e68f89de742d2c1fd306e3ce1c 100644 (file)
--- a/lib/grouplist.php
+++ b/lib/grouplist.php
@@ -151,7 +151,7 @@ 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();
         }