[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1953] sendConfirmation flag is fixed

[solomax]

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/4.0.x by this push:
     new c2c9d1f  [OPENMEETINGS-1953] sendConfirmation flag is fixed
c2c9d1f is described below

commit c2c9d1f255b98e2ecc8a69dccd979a70d05f8b3b
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Tue Oct 9 20:22:23 2018 +0700

    [OPENMEETINGS-1953] sendConfirmation flag is fixed
---
 .../java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java     | 2 --
 1 file changed, 2 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
index d66e1bd..153b180 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
@@ -154,8 +154,6 @@ public class RegisterDialog extends 
NonClosableDialog<String> {
                String messageCode = "account.created";
                if (sendConfirmation && sendEmailAtRegister) {
                        messageCode = "warn.notverified";
-               } else if (sendConfirmation) {
-                       messageCode = "1591";
                }
                confirmRegistration.setModelObject(getString(messageCode));
                reset(handler);