Merge branch 'master' into social-master

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

diff --git a/classes/Local_group.php b/classes/Local_group.php
index 44d8957838f0823772bc59abb4ce5875b2fe6ec4..c0dcf02e4be3e86b7f5a14fe15cf1bd677575322 100644 (file)
--- a/classes/Local_group.php
+++ b/classes/Local_group.php
@@ -14,9 +14,6 @@ class Local_group extends Managed_DataObject
     public $created;                         // datetime   not_null default_0000-00-00%2000%3A00%3A00
     public $modified;                        // timestamp   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Local_group',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
@@ -41,10 +38,24 @@ 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();
+    }
+
+    public function getGroup()
+    {
+        return User_group::getKV('id', $this->group_id);
+    }
+
     function setNickname($nickname)
     {
         $this->decache();
-        $qry = 'UPDATE local_group set nickname = "'.$nickname.'" where group_id = ' . $this->group_id;
+        $qry = 'UPDATE local_group set nickname = "'.$this->escape($nickname).'" where group_id = ' . $this->group_id;
 
         $result = $this->query($qry);