From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 12 Jan 2017 22:20:46 +0000 (+0000)
Subject: Don't compare timestamps with 0, triggers SQL errors with PostgreSQL (#10840).
X-Git-Tag: 3.4.0~434
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=82d96258f4418f567ebe5314f3d51c82d15efc8d;p=redmine.git

Don't compare timestamps with 0, triggers SQL errors with PostgreSQL (#10840).

git-svn-id: http://svn.redmine.org/redmine/trunk@16175 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/app/models/token.rb b/app/models/token.rb
index 796622053..45703a085 100644
--- a/app/models/token.rb
+++ b/app/models/token.rb
@@ -48,7 +48,8 @@ class Token < ActiveRecord::Base
 
   # Return true if token has expired
   def expired?
-    return created_on < self.class.invalid_when_created_before(action)
+    validity_time = self.class.invalid_when_created_before(action)
+    validity_time.present? && created_on < validity_time
   end
 
   def max_instances
@@ -63,9 +64,7 @@ class Token < ActiveRecord::Base
       validity_time = self.validity_time
     end
 
-    if validity_time.nil?
-      0
-    else
+    if validity_time
       Time.now - validity_time
     end
   end