Fix some broken identity APIs:

- add_user_to_group and remove_user_from_group should take Group_Definition instances
  to be consistent
- add_user_to_group and remove_user_from_group in drivers/IdentityProvider.php should
  not be static

2 files changed, 6 insertions, 9 deletions

diff --git a/modules/user/helpers/group.php b/modules/user/helpers/group.php
index c84910f1..88bfac35 100644
--- a/modules/user/helpers/group.php
+++ b/modules/user/helpers/group.php
@@ -68,13 +68,13 @@ class group_Core {
    */
   private static function _lookup_by_field($field_name, $value) {
     try {
-      $user = model_cache::get("group", $value, $field_name);
-      if ($user->loaded()) {
-        return $user;
+      $group = model_cache::get("group", $value, $field_name);
+      if ($group->loaded()) {
+        return $group;
       }
     } catch (Exception $e) {
       if (strpos($e->getMessage(), "MISSING_MODEL") === false) {
-       throw $e;
+        throw $e;
       }
     }
     return null;
diff --git a/modules/user/libraries/drivers/IdentityProvider/Gallery.php b/modules/user/libraries/drivers/IdentityProvider/Gallery.php
index 1ed7dd4f..44433ad7 100644
--- a/modules/user/libraries/drivers/IdentityProvider/Gallery.php
+++ b/modules/user/libraries/drivers/IdentityProvider/Gallery.php
@@ -148,9 +148,7 @@ class IdentityProvider_Gallery_Driver implements IdentityProvider_Driver {
   /**
    * @see IdentityProvider_Driver::add_user_to_group.
    */
-  static function add_user_to_group($user, $group_id) {
-    $group = self::lookup_group($group_id);
-
+  public function add_user_to_group($user, $group) {
     $group->add($user);
     $group->save();
   }
@@ -158,8 +156,7 @@ class IdentityProvider_Gallery_Driver implements IdentityProvider_Driver {
   /**
    * @see IdentityProvider_Driver::remove_user_to_group.
    */
-  static function remove_user_from_group($user, $group_id) {
-    $group = self::lookup_group_by_name($group_id);
+  public function remove_user_from_group($user, $group_id) {
     $group->remove($user);
     $group->save();
   }