Merge pull request #3189 from vanilla/hotfix/arg-conflict

Fix ProfileExtender dropping data when email confirmation is used with applicant registration
vanilla · Oct 9, 2015 · 5e92c16 · 5e92c16
2 parents bb96fc9 + 55b93e4
commit 5e92c16
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/applications/dashboard/models/class.usermodel.php b/applications/dashboard/models/class.usermodel.php
@@ -1746,7 +1746,7 @@ public function register($FormPostValues, $Options = array()) {
 
         // Throw an event to allow plugins to block the registration.
         unset($this->EventArguments['User']);
-        $this->EventArguments['User'] = $FormPostValues;
+        $this->EventArguments['RegisteringUser'] =& $FormPostValues;
         $this->EventArguments['Valid'] =& $Valid;
         $this->fireEvent('BeforeRegister');
 

diff --git a/plugins/ProfileExtender/class.profileextender.plugin.php b/plugins/ProfileExtender/class.profileextender.plugin.php
@@ -465,7 +465,7 @@ public function userModel_afterSave_handler($Sender, $Args) {
      * @param $Args array
      */
     public function userModel_afterInsertUser_handler($Sender, $Args) {
-        $this->updateUserFields($Args['InsertUserID'], $Args['User']);
+        $this->updateUserFields($Args['InsertUserID'], $Args['RegisteringUser']);
     }
 
     /**