From 7a6d2f13d8402bfc73751b92609785b98f2f6a00 Mon Sep 17 00:00:00 2001
From: Mike McKay <mfmckay@wustl.edu>
Date: Mon, 19 Sep 2016 16:08:09 -0500
Subject: [PATCH] XNAT-4522 Got it so users could reenable expired accounts
again.
---
.../security/provider/XnatDatabaseAuthenticationProvider.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/nrg/xnat/security/provider/XnatDatabaseAuthenticationProvider.java b/src/main/java/org/nrg/xnat/security/provider/XnatDatabaseAuthenticationProvider.java
index 3ad7b36a..b1bccb8d 100644
--- a/src/main/java/org/nrg/xnat/security/provider/XnatDatabaseAuthenticationProvider.java
+++ b/src/main/java/org/nrg/xnat/security/provider/XnatDatabaseAuthenticationProvider.java
@@ -135,7 +135,7 @@ public class XnatDatabaseAuthenticationProvider extends DaoAuthenticationProvide
String query = "SELECT COUNT(*) AS count " +
"FROM xdat_user_history " +
"WHERE xdat_user_id=" + xdatUserDetails.getID() + " " +
- "AND change_user=" + xdatUserDetails.getID() + " " +
+ //"AND change_user=" + xdatUserDetails.getID() + " " +
"AND change_date = (SELECT MAX(change_date) " +
"FROM xdat_user_history " +
"WHERE xdat_user_id=" + xdatUserDetails.getID() + " " +
--
GitLab