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

common/modules/users/models/User.php

@@ -519,12 +519,21 @@ class User extends \common\components\ActiveRecordModel implements IdentityInter
 			return false;
 
 		if ($this->scenario===self::SCENARIO_REGISTRATION) {
-			if (!$this->afterRegistration(['email' => $this->email, 'user_fio' => $this->fio]))
+			if (!$this->afterRegistration(['email' => $this->email, 'user_fio' => $this->getFio()]))
 				return false;
 		}
 		return true;
 	}
 
+	public function getFio()
+	{
+		$result = $this->name;
+		if (isset($this->surname) && strlen($this->surname)>0) {
+			$result .= ' '.$this->surname;
+		}
+		return $result;
+	}
+
 	public function beforeDelete()
 	{
 		if (parent::beforeDelete())