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 2013/06/03 11:34:26 UTC
svn commit: r1488938 -
/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java
Author: jleroux
Date: Mon Jun 3 09:34:26 2013
New Revision: 1488938
URL: http://svn.apache.org/r1488938
Log:
A fixing patch from Leon for "Some enhancement to password change." https://issues.apache.org/jira/browse/OFBIZ-5176
This line should not have been changed, "requirePasswordChange" can come from UserLogin not only "request"
Modified:
ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java
Modified: ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java?rev=1488938&r1=1488937&r2=1488938&view=diff
==============================================================================
--- ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java (original)
+++ ofbiz/trunk/framework/webapp/src/org/ofbiz/webapp/control/LoginWorker.java Mon Jun 3 09:34:26 2013
@@ -465,7 +465,7 @@ public class LoginWorker {
// check to see if a password change is required for the user
Map<String, Object> userLoginSession = checkMap(result.get("userLoginSession"), String.class, Object.class);
- if (userLogin != null && requirePasswordChange) {
+ if (userLogin != null && "Y".equals(userLogin.getString("requirePasswordChange"))) {
return "requirePasswordChange";
}
String autoChangePassword = UtilProperties.getPropertyValue("security.properties", "user.auto.change.password.enable", "false");