summaryrefslogtreecommitdiff
path: root/modules/user
diff options
context:
space:
mode:
authorNathan Kinkade <nkinkade@nkinka.de>2010-01-09 23:02:55 +0000
committerNathan Kinkade <nkinkade@nkinka.de>2010-01-09 23:02:55 +0000
commit0a67b836a9b5021c91b9c327d3693991c3248dfc (patch)
tree91f49ca62a9ffd586e01bde700068f87e884181a /modules/user
parent232c0b7fd0df7f84543bc29380a0734ef1e84a02 (diff)
parentbd9f945e3f2de4ea2402bd3941dba69c79ddc5a4 (diff)
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/user')
-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();
}
/**