From 6b717a6a6917bd024431f8d1e0835325e0194421 Mon Sep 17 00:00:00 2001
From: Mikael Nordfeldth <mmn@hethane.se>
Date: Tue, 26 May 2015 13:14:26 +0200
Subject: [PATCH] Throw exception if Local_group has no corresponding
 User_group

---
 classes/Local_group.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/classes/Local_group.php b/classes/Local_group.php
index c0dcf02e4b..9e95102d85 100644
--- 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 NoResultException($group);
+        }
+        return $group;
     }
 
     function setNickname($nickname)
-- 
2.39.5