Merge branch 'release/2.6.3'

getgrav · Apr 12, 2018 · 05afc8d · 05afc8d
2 parents 0905c0f + f62c686
commit 05afc8d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v2.6.3
+## 04/12/2018
+
+1. [](#bugfix)
+    * Fixed issue with saving profile and stating email has already exists
+
 # v2.6.2
 ## 04/12/2018
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Login
-version: 2.6.2
+version: 2.6.3
 description: Enables user authentication and login screen.
 icon: sign-in
 author:

diff --git a/login.php b/login.php
@@ -768,7 +768,7 @@ private function processUserProfile($form, Event $event)
         // Check for existing email
         $email    = $form->value('email');
         $existing_email = User::find($email,['email']);
-        if ($existing_email->exists()) {
+        if ($user->username != $existing_email->username && $existing_email->exists()) {
             $this->grav->fireEvent('onFormValidationError', new Event([
                 'form'    => $form,
                 'message' => $language->translate([