Modern version of XMPPHP extlib

[quix0rs-gnu-social.git] / plugins / RequireValidatedEmail / actions / confirmfirstemail.php

diff --git a/plugins/RequireValidatedEmail/actions/confirmfirstemail.php b/plugins/RequireValidatedEmail/actions/confirmfirstemail.php
index 465814342d1bd44eca0e2acebc3089ab6a6c6086..d0d1893739bd03400d91cef554bce9b5aa5ab67e 100644 (file)
--- a/plugins/RequireValidatedEmail/actions/confirmfirstemail.php
+++ b/plugins/RequireValidatedEmail/actions/confirmfirstemail.php
@@ -150,13 +150,14 @@ class ConfirmfirstemailAction extends Action
 
         $this->user->email = $this->confirm->address;
 
+        // Throws exception on failure.
         $this->user->updateWithKeys($orig);
 
         $this->user->emailChanged();
 
         $orig = clone($this->user);
 
-        $this->user->password = common_munge_password($this->password, $this->user->id);
+        $this->user->password = common_munge_password($this->password, $this->user->getProfile());
 
         $this->user->update($orig);