Merge request from chimo adding getvaliddaemons to stopdaemons.php

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

diff --git a/classes/User_group.php b/classes/User_group.php
index 762b4466016f8f16c7ee530f79759ee2e9296fad..aad38b635885540a29bf2b63e3b4b330744172b1 100644 (file)
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -74,23 +74,28 @@ class User_group extends Managed_DataObject
         );
     }
 
-    protected $_profile = null;
+    protected $_profile = array();
 
     /**
      * @return Profile
      *
-     * @throws UserNoProfileException if user has no profile
+     * @throws GroupNoProfileException if user has no profile
      */
     public function getProfile()
     {
-        if (!($this->_profile instanceof Profile)) {
-            $this->_profile = Profile::getKV('id', $this->profile_id);
-            if (!($this->_profile instanceof Profile)) {
+        if (!isset($this->_profile[$this->profile_id])) {
+            $profile = Profile::getKV('id', $this->profile_id);
+            if (!$profile instanceof Profile) {
                 throw new GroupNoProfileException($this);
             }
+            $this->_profile[$this->profile_id] = $profile;
         }
+        return $this->_profile[$this->profile_id];
+    }
 
-        return $this->_profile;
+    public function getNickname()
+    {
+        return $this->getProfile()->getNickname();
     }
 
     public static function defaultLogo($size)