about summary refs log tree commit diff
path: root/app/models/concerns
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2021-03-15 11:26:59 +0100
committerClaire <claire.github-309c@sitedethib.com>2021-03-15 11:26:59 +0100
commiteac4a3e9c82b0ff8ade2e8b86282387df6039868 (patch)
treed16cecb0e7c74dc8498074ce5e0670a4b3c67b2f /app/models/concerns
parent995ad2af30d4838d07d68f0e89f1868307d1e478 (diff)
parente89e976e924f558d13893726b3edda7b428988fd (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/models/concerns')
-rw-r--r--app/models/concerns/expireable.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/concerns/expireable.rb b/app/models/concerns/expireable.rb
index a66a4661b..4d902abcb 100644
--- a/app/models/concerns/expireable.rb
+++ b/app/models/concerns/expireable.rb
@@ -17,7 +17,7 @@ module Expireable
     end
 
     def expires_in=(interval)
-      self.expires_at = interval.to_i.seconds.from_now if interval.present?
+      self.expires_at = interval.present? ? interval.to_i.seconds.from_now : nil 
       @expires_in     = interval
     end