summaryrefslogtreecommitdiff
path: root/modules/user/libraries/drivers
diff options
context:
space:
mode:
authormamouneyya <mamoun.diraneyya@gmail.com>2010-09-07 08:41:25 +0300
committermamouneyya <mamoun.diraneyya@gmail.com>2010-09-07 08:41:25 +0300
commitba950bec0c84a1467aa2545ca815d5af7b0b002b (patch)
tree307cdacf0ece60ae9b2db94ad43fcf00d769dcfc /modules/user/libraries/drivers
parent9572c664d2bfff0877d4f2062eb0ef6665a109cf (diff)
parent7c80bc0c3db1ca20ce424a36a05f1337de9e1e31 (diff)
Merge remote branch 'gallery3/master'
Diffstat (limited to 'modules/user/libraries/drivers')
-rw-r--r--modules/user/libraries/drivers/IdentityProvider/Gallery.php7
1 files changed, 2 insertions, 5 deletions
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();
}