Merge branch 'master' of git://github.com/gallery/gallery3

1 files changed, 10 insertions, 3 deletions

diff --git a/modules/user/libraries/drivers/IdentityProvider/Gallery.php b/modules/user/libraries/drivers/IdentityProvider/Gallery.php
index d874512c..666f185f 100644
--- a/modules/user/libraries/drivers/IdentityProvider/Gallery.php
+++ b/modules/user/libraries/drivers/IdentityProvider/Gallery.php
@@ -38,8 +38,13 @@ class IdentityProvider_Gallery_Driver implements IdentityProvider_Driver {
   /**
    * @see IdentityProvider_Driver::create_user.
    */
-  public function create_user($name, $full_name, $password) {
-    return user::create($name, $full_name, $password);
+  public function create_user($name, $full_name, $password, $email) {
+    $user = ORM::factory("user");
+    $user->name = $name;
+    $user->full_name = $full_name;
+    $user->password = $password;
+    $user->email = $email;
+    return $user->save();
   }
 
   /**
@@ -91,7 +96,9 @@ class IdentityProvider_Gallery_Driver implements IdentityProvider_Driver {
    * @see IdentityProvider_Driver::create_group.
    */
   public function create_group($name) {
-    return group::create($name);
+    $group = ORM::factory("group");
+    $group->name = $name;
+    return $group->save();
   }
 
   /**