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

1 files changed, 3 insertions, 3 deletions

diff --git a/modules/gallery/libraries/IdentityProvider.php b/modules/gallery/libraries/IdentityProvider.php
index 2ed85bd1..3f1666eb 100644
--- a/modules/gallery/libraries/IdentityProvider.php
+++ b/modules/gallery/libraries/IdentityProvider.php
@@ -83,7 +83,7 @@ class IdentityProvider_Core {
 
       module::event("identity_provider_changed", $current_provider, $new_provider);
 
-      auth::login($provider->admin_user());
+      identity::set_active_user($provider->admin_user());
       Session::instance()->regenerate();
     } catch (Exception $e) {
       static $restore_already_running;
@@ -174,8 +174,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);
   }
 
   /**