summaryrefslogtreecommitdiff
path: root/modules/user/libraries
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2010-01-07 10:41:19 -0800
committerBharat Mediratta <bharat@menalto.com>2010-01-07 10:41:19 -0800
commitc711bf1b1fcf7840467a7a044b1f511e7b69c139 (patch)
treeee84a16b5ce4448fd41ba7ffa2cb2381b225e206 /modules/user/libraries
parent31454d37b3ea02104925f1976609576c5f09c0c6 (diff)
parent10c05c855a1634a60048a52e8d90bc51f187ede7 (diff)
Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev
Diffstat (limited to 'modules/user/libraries')
-rw-r--r--modules/user/libraries/drivers/IdentityProvider/Gallery.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/modules/user/libraries/drivers/IdentityProvider/Gallery.php b/modules/user/libraries/drivers/IdentityProvider/Gallery.php
index 50064287..d874512c 100644
--- a/modules/user/libraries/drivers/IdentityProvider/Gallery.php
+++ b/modules/user/libraries/drivers/IdentityProvider/Gallery.php
@@ -127,9 +127,8 @@ class IdentityProvider_Gallery_Driver implements IdentityProvider_Driver {
*/
public function get_user_list($ids) {
return ORM::factory("user")
- ->in("id", $ids)
- ->find_all()
- ->as_array();
+ ->where("id", "IN", $ids)
+ ->find_all();
}
/**