From 5c7ee9a19208ba0627ec8a3f3b1660068e9ac483 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= <acanas@ugr.es>
Date: Mon, 10 Oct 2016 20:02:47 +0200
Subject: [PATCH] Version 16.19.1

---
 swad_account.c   | 15 +++++++--------
 swad_changelog.h |  2 +-
 swad_mail.c      |  3 +--
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/swad_account.c b/swad_account.c
index 6c636b05f..d236e62d3 100644
--- a/swad_account.c
+++ b/swad_account.c
@@ -437,6 +437,10 @@ void Acc_ShowFormChangeMyAccount (void)
 	 IShouldFillID = true;
      }
 
+   /***** Show alert to report that confirmation e-mail has been sent *****/
+   if (Gbl.Usrs.Me.ConfirmEmailJustSent)
+      Mai_ShowMsgConfirmEmailHasBeenSent ();
+
    /***** Put links to change my password and to remove my account*****/
    fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
    Pwd_PutLinkToChangeMyPassword ();
@@ -462,17 +466,12 @@ void Acc_ShowFormChangeMyAccount (void)
    Acc_PrintAccountSeparator ();
 
    /***** E-mail *****/
-   if (IMustFillEmail || IShouldConfirmEmail ||
-       Gbl.Usrs.Me.ConfirmEmailJustSent)
+   if (IMustFillEmail || IShouldConfirmEmail)
      {
       fprintf (Gbl.F.Out,"<tr>"
 	                 "<td colspan=\"2\">");
-      if (IMustFillEmail)
-	 Lay_ShowAlert (Lay_WARNING,Txt_Please_fill_in_your_email_address);
-      else if (IShouldConfirmEmail)
-	 Lay_ShowAlert (Lay_WARNING,Txt_Please_check_and_confirm_your_email_address);
-      else	// Gbl.Usrs.Me.ConfirmEmailJustSent
-	 Mai_ShowMsgConfirmEmailHasBeenSent ();
+      Lay_ShowAlert (Lay_WARNING,IMustFillEmail ? Txt_Please_fill_in_your_email_address :
+	                                          Txt_Please_check_and_confirm_your_email_address);
       fprintf (Gbl.F.Out,"</td>"
 	                 "</tr>");
      }
diff --git a/swad_changelog.h b/swad_changelog.h
index 5699952ca..871fdab90 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -155,7 +155,7 @@
 // Number of lines (includes comments but not blank lines) has been got with the following command:
 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
 /*
-        Version 16.19.1:  Oct 10, 2016	Message to report that confirmation e-mail has been sent. (? lines)
+        Version 16.19.1:  Oct 10, 2016	Message to report that confirmation e-mail has been sent. (205203 lines)
         Version 16.19:    Oct 10, 2016	Warning in User > Session to confirm user's e-mail address.
 					Changes in form to edit user's account. (205194 lines)
         Version 16.18.1:  Oct 10, 2016	Warning in User > Account to confirm user's e-mail address. (205116 lines)
diff --git a/swad_mail.c b/swad_mail.c
index 32f67f5b9..bc7ec1936 100644
--- a/swad_mail.c
+++ b/swad_mail.c
@@ -1407,8 +1407,7 @@ static void Mai_NewUsrEmail (struct UsrData *UsrDat,bool ItsMe)
 	       /***** Send message via email
 		      to confirm the new email address *****/
 	       if (ItsMe)
-		  if (Mai_SendMailMsgToConfirmEmail ())
-		     Mai_ShowMsgConfirmEmailHasBeenSent ();
+		  Mai_SendMailMsgToConfirmEmail ();
 	      }
 	    else
 	      {