You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2016/11/26 22:40:18 UTC
svn commit: r1771518 - in /ofbiz/branches:
release13.07/framework/common/src/org/ofbiz/common/login/
release14.12/framework/common/src/org/ofbiz/common/login/
release15.12/framework/common/src/org/ofbiz/common/login/
Author: jleroux
Date: Sat Nov 26 22:40:18 2016
New Revision: 1771518
URL: http://svn.apache.org/viewvc?rev=1771518&view=rev
Log:
Backports by hand
=============================================================================
Fixed: Errormessage is displayed twice in LoginEvents.java
(OFBIZ-9125)
Issue:
The errormessage "The password does not match the pattern" is called twice
in LoginServices.java.
Fix:
Delete second assignment for variable "errMsg".
jleroux: I simply removed the author commented out comment (2 lines)
Thanks: Heiko Elberg
=============================================================================
Modified:
ofbiz/branches/release13.07/framework/common/src/org/ofbiz/common/login/LoginServices.java
ofbiz/branches/release14.12/framework/common/src/org/ofbiz/common/login/LoginServices.java
ofbiz/branches/release15.12/framework/common/src/org/ofbiz/common/login/LoginServices.java
Modified: ofbiz/branches/release13.07/framework/common/src/org/ofbiz/common/login/LoginServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/common/src/org/ofbiz/common/login/LoginServices.java?rev=1771518&r1=1771517&r2=1771518&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/common/src/org/ofbiz/common/login/LoginServices.java (original)
+++ ofbiz/branches/release13.07/framework/common/src/org/ofbiz/common/login/LoginServices.java Sat Nov 26 22:40:18 2016
@@ -966,7 +966,6 @@ public class LoginServices {
"security.login.password.pattern.description", "loginservices.password_must_be_least_characters_long");
errMsg = UtilProperties.getMessage(resource, passwordPatternMessage, messageMap, locale);
messageMap = UtilMisc.toMap("passwordPatternMessage", errMsg);
- errMsg = UtilProperties.getMessage(resource,"loginservices.password.pattern.errmsg", messageMap, locale);
errorMessageList.add(errMsg);
}
} else {
Modified: ofbiz/branches/release14.12/framework/common/src/org/ofbiz/common/login/LoginServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/common/src/org/ofbiz/common/login/LoginServices.java?rev=1771518&r1=1771517&r2=1771518&view=diff
==============================================================================
--- ofbiz/branches/release14.12/framework/common/src/org/ofbiz/common/login/LoginServices.java (original)
+++ ofbiz/branches/release14.12/framework/common/src/org/ofbiz/common/login/LoginServices.java Sat Nov 26 22:40:18 2016
@@ -973,7 +973,6 @@ public class LoginServices {
"security.login.password.pattern.description", "loginservices.password_must_be_least_characters_long", delegator);
errMsg = UtilProperties.getMessage(resource, passwordPatternMessage, messageMap, locale);
messageMap = UtilMisc.toMap("passwordPatternMessage", errMsg);
- errMsg = UtilProperties.getMessage(resource,"loginservices.password.pattern.errmsg", messageMap, locale);
errorMessageList.add(errMsg);
}
} else {
Modified: ofbiz/branches/release15.12/framework/common/src/org/ofbiz/common/login/LoginServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/framework/common/src/org/ofbiz/common/login/LoginServices.java?rev=1771518&r1=1771517&r2=1771518&view=diff
==============================================================================
--- ofbiz/branches/release15.12/framework/common/src/org/ofbiz/common/login/LoginServices.java (original)
+++ ofbiz/branches/release15.12/framework/common/src/org/ofbiz/common/login/LoginServices.java Sat Nov 26 22:40:18 2016
@@ -993,7 +993,6 @@ public class LoginServices {
"security.login.password.pattern.description", "loginservices.password_must_be_least_characters_long", delegator);
errMsg = UtilProperties.getMessage(resource, passwordPatternMessage, messageMap, locale);
messageMap = UtilMisc.toMap("passwordPatternMessage", errMsg);
- errMsg = UtilProperties.getMessage(resource,"loginservices.password.pattern.errmsg", messageMap, locale);
errorMessageList.add(errMsg);
}
} else {