fix issue with registration via email and useUsername=false (#130)

amnah · Jan 26, 2016 · ded8b30 · ded8b30
1 parent da5fa76
commit ded8b30
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/controllers/DefaultController.php b/controllers/DefaultController.php
@@ -132,13 +132,14 @@ public function actionLoginCallback($token)
 
         // load post data
         $post = Yii::$app->request->post();
-        if ($userToken && $user->load($post)) {
+        $userLoaded = $user->load($post);
+        $profileLoaded = $profile->load($post);
+        if ($userToken && ($userLoaded || $profileLoaded)) {
 
             // ensure that email is taken from the $userToken (and not from user input)
             $user->email = $userToken->data;
 
             // validate and register
-            $profile->load($post);
             if ($user->validate() && $profile->validate()) {
                 $role = $this->module->model("Role");
                 $user->setRegisterAttributes($role::ROLE_USER, $user::STATUS_ACTIVE)->save();