Merge branch 'master' of git.task-on.com:ktask/task-on.com

common/modules/triggers/models/TriggerTrigger.php

@@ -224,9 +224,15 @@ class TriggerTrigger extends \common\components\ActiveRecordModel
             return 'Email not found';
         }
 
-        $user = User::findOne(['email' => $email]);
+        $user = User::find()->where(['email' => $email])->one();
 
-        $templateData['user_fio'] = (!is_null($user)) ? $user->fio : '';
+        if (array_key_exists('user_fio', $params))
+            $user_fio = $params['user_fio'];
+        elseif(!is_null($user)) {
+            $user_fio = $user->fio;
+        }
+
+        $templateData['user_fio'] = (isset($user_fio)) ? $user_fio : '';
 
         /** @var \DateTime $time_now */
         $time_now=new \DateTime();

common/modules/users/models/User.php

@@ -519,7 +519,7 @@ class User extends \common\components\ActiveRecordModel implements IdentityInter
 			return false;
 
 		if ($this->scenario===self::SCENARIO_REGISTRATION) {
-			if (!$this->afterRegistration(['email' => $this->email]))
+			if (!$this->afterRegistration(['email' => $this->email, 'user_fio' => $this->fio]))
 				return false;
 		}
 		return true;