Reviewed: https://reviews.mahara.org/8573 Committed: https://git.mahara.org/mahara/mahara/commit/8e6c286bbafe723f044cea1e4d5d10f501b76fbc Submitter: Robert Lyon (<email address hidden>) Branch: 17.04_STABLE
commit 8e6c286bbafe723f044cea1e4d5d10f501b76fbc Author: Robert Lyon <email address hidden> Date: Fri Mar 2 09:31:02 2018 +1300
Bug 1748782: Fix clash of 'active' values in user search results
We were confusing user active with auth active values from db call So changed the auth 'active' to 'authactive'
Also add warning message to top of admin/users/edit.php page to indicate that user has expired (similar to when user is suspended)
behatnotneeded
Change-Id: I437665cffa6f2d372ef4c5c39fad7bec183e3a2d Signed-off-by: Robert Lyon <email address hidden> (cherry picked from commit 6b8396d683837312f11112b5034d9932bd6f1984)
Reviewed: https:/ /reviews. mahara. org/8573 /git.mahara. org/mahara/ mahara/ commit/ 8e6c286bbafe723 f044cea1e4d5d10 f501b76fbc
Committed: https:/
Submitter: Robert Lyon (<email address hidden>)
Branch: 17.04_STABLE
commit 8e6c286bbafe723 f044cea1e4d5d10 f501b76fbc
Author: Robert Lyon <email address hidden>
Date: Fri Mar 2 09:31:02 2018 +1300
Bug 1748782: Fix clash of 'active' values in user search results
We were confusing user active with auth active values from db call
So changed the auth 'active' to 'authactive'
Also add warning message to top of admin/users/ edit.php page to
indicate that user has expired (similar to when user is suspended)
behatnotneeded
Change-Id: I437665cffa6f2d 372ef4c5c39fad7 bec183e3a2d 2f11112b5034d99 32bd6f1984)
Signed-off-by: Robert Lyon <email address hidden>
(cherry picked from commit 6b8396d68383731