Merge branch 'group-join' into 'nightly'

Add User_group::getObjectType

Since 174586bd512, I'm unable to join groups with the logs complaining
about getObjectType not existing on the User_group object.

Note: I'm not sure if this is the correct value to return here, but I
was able to joing groups successfully using this. Let me know if it needs
to be changed and I'll update the Merge Request!

See merge request !56

diff --git a/classes/User_group.php b/classes/User_group.php
index 01437ace39a6b2aa88506990fc5171c5107d9ab7..344394a682052ef9d8d3203f1e41491002881837 100644 (file)
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -33,6 +33,12 @@ class User_group extends Managed_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    public function getObjectType()
+    {
+        return ActivityObject::GROUP;
+    }
+
+
     public static function schemaDef()
     {
         return array(