Merge remote-tracking branch 'upstream/master'

[quix0rs-gnu-social.git] / classes / Local_group.php

diff --git a/classes/Local_group.php b/classes/Local_group.php
index c0dcf02e4be3e86b7f5a14fe15cf1bd677575322..1cebd4c40c3a777bbb31b95ab8dcf3230485c0f2 100644 (file)
--- a/classes/Local_group.php
+++ b/classes/Local_group.php
@@ -40,16 +40,19 @@ class Local_group extends Managed_DataObject
 
     public function getProfile()
     {
-        $group = $this->getGroup();
-        if (!$group instanceof User_group) {
-            return null;    // TODO: Throw exception when other code is ready
-        }
-        return $group->getProfile();
+        return $this->getGroup()->getProfile();
     }
 
     public function getGroup()
     {
-        return User_group::getKV('id', $this->group_id);
+        $group = new User_group();
+        $group->id = $this->group_id;
+        $group->find(true);
+        if (!$group instanceof User_group) {
+            common_log(LOG_ERR, 'User_group does not exist for Local_group: '.$this->group_id);
+            throw new NoSuchGroupException(array('id' => $this->group_id));
+        }
+        return $group;
     }
 
     function setNickname($nickname)