From 738ecf13654cbad7de53af516d13b004bead4ff3 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 10 May 2015 12:57:16 +0000 Subject: [PATCH] Test broken by r14265 (#19458). git-svn-id: http://svn.redmine.org/redmine/trunk@14266 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/user.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index 3ecf03c18..ebfd02ea0 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -325,7 +325,8 @@ class User < Principal # Returns true if the user password has expired def password_expired? - if Setting.password_max_age.to_i.zero? + period = Setting.password_max_age.to_i + if period.zero? false else changed_on = self.passwd_changed_on || Time.at(0)