From f20fa2cfedc42f98a38a77d77186d180bd0c3426 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 17 Jan 2010 20:37:25 -0800
Subject: Change IdentityProvider::create_user() to take $email as well, since
 that's a required parameter for the Gallery driver.

---
 modules/gallery/helpers/identity.php                        | 4 ++--
 modules/gallery/libraries/IdentityProvider.php              | 4 ++--
 modules/gallery/libraries/drivers/IdentityProvider.php      | 3 ++-
 modules/user/libraries/drivers/IdentityProvider/Gallery.php | 3 ++-
 4 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/identity.php b/modules/gallery/helpers/identity.php
index eae0ea3e..ef93d72f 100644
--- a/modules/gallery/helpers/identity.php
+++ b/modules/gallery/helpers/identity.php
@@ -155,8 +155,8 @@ class identity_Core {
   /**
    * @see IdentityProvider_Driver::create_user.
    */
-  static function create_user($name, $full_name, $password) {
-    return IdentityProvider::instance()->create_user($name, $full_name, $password);
+  static function create_user($name, $full_name, $password, $email) {
+    return IdentityProvider::instance()->create_user($name, $full_name, $password, $email);
   }
 
   /**
diff --git a/modules/gallery/libraries/IdentityProvider.php b/modules/gallery/libraries/IdentityProvider.php
index bcb3056a..30d4efa4 100644
--- a/modules/gallery/libraries/IdentityProvider.php
+++ b/modules/gallery/libraries/IdentityProvider.php
@@ -119,8 +119,8 @@ class IdentityProvider_Core {
   /**
    * @see IdentityProvider_Driver::create_user.
    */
-  public function create_user($name, $full_name, $password) {
-    return $this->driver->create_user($name, $full_name, $password);
+  public function create_user($name, $full_name, $password, $email) {
+    return $this->driver->create_user($name, $full_name, $password, $email);
   }
 
   /**
diff --git a/modules/gallery/libraries/drivers/IdentityProvider.php b/modules/gallery/libraries/drivers/IdentityProvider.php
index a808c7e8..b7b1fbe8 100644
--- a/modules/gallery/libraries/drivers/IdentityProvider.php
+++ b/modules/gallery/libraries/drivers/IdentityProvider.php
@@ -38,9 +38,10 @@ interface IdentityProvider_Driver {
    * @param string  $name
    * @param string  $full_name
    * @param string  $password
+   * @param string  $email
    * @return User_Definition the user object
    */
-  public function create_user($name, $full_name, $password);
+  public function create_user($name, $full_name, $password, $email);
 
   /**
    * Is the password provided correct?
diff --git a/modules/user/libraries/drivers/IdentityProvider/Gallery.php b/modules/user/libraries/drivers/IdentityProvider/Gallery.php
index 9927ea33..666f185f 100644
--- a/modules/user/libraries/drivers/IdentityProvider/Gallery.php
+++ b/modules/user/libraries/drivers/IdentityProvider/Gallery.php
@@ -38,11 +38,12 @@ class IdentityProvider_Gallery_Driver implements IdentityProvider_Driver {
   /**
    * @see IdentityProvider_Driver::create_user.
    */
-  public function create_user($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();
   }
 
-- 
cgit v1.2.3