Merge remote-tracking branch 'upstream/master'

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

diff --git a/plugins/RequireValidatedEmail/actions/confirmfirstemail.php b/plugins/RequireValidatedEmail/actions/confirmfirstemail.php
index cc4b646f6b024c37e84fb01d370af8f8687b7498..d0d1893739bd03400d91cef554bce9b5aa5ab67e 100644 (file)
--- a/plugins/RequireValidatedEmail/actions/confirmfirstemail.php
+++ b/plugins/RequireValidatedEmail/actions/confirmfirstemail.php
@@ -157,7 +157,7 @@ class ConfirmfirstemailAction extends Action
 
         $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);