Merge branch 'dev'

common/models/User.php

@@ -220,7 +220,12 @@ class User extends ActiveRecordCommon implements IdentityInterface
          */
         public function verifyEmail($attribute, $params)
         {
-                $user = User::find()->where("email LIKE :email AND id != :id")->params(array(':email' => '%' . $this->email . '%', ':id' => $this->id))->one();
+                if($this->id) {
+                        $user = User::find()->where("email LIKE :email AND id != :id")->params(array(':email' => '%' . $this->email . '%', ':id' => $this->id))->one();
+                }
+                else {
+                        $user = User::find()->where("email LIKE :email")->params(array(':email' => '%' . $this->email . '%'))->one();
+                }
 
                 if ($user) {
                         $this->addError($attribute, 'Cette adresse email est déjà utilisée par un autre utilisateur ');