From f72c352da5560f149794eff0a276c07745165838 Mon Sep 17 00:00:00 2001
From: Guy Halse <ghalse@users.noreply.github.com>
Date: Wed, 18 Nov 2020 17:06:15 +0200
Subject: [PATCH] Fix logic leading to negative expiry (#1402)
---
modules/core/templates/frontpage_federation.twig | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/core/templates/frontpage_federation.twig b/modules/core/templates/frontpage_federation.twig
index 68642316b..c3dd71c8e 100644
--- a/modules/core/templates/frontpage_federation.twig
+++ b/modules/core/templates/frontpage_federation.twig
@@ -48,9 +48,9 @@
{% endif -%}</a>
{%- if entity.expire is defined %}
- {% if entity.expire > date().timestamp %}
- <span class="entity-expired"> (expired {{ ((date().timestamp - entity.expire) / 3600) }} hours ago)</span>
- {% else %} (expires in {{ ((entity.expire - date().timestamp) / 3600) }} hours){% endif -%}{% endif %}
+ {% if ((entity.expire - date().timestamp) < 0) %}
+ <span class="entity-expired"> (expired {{ ((date().timestamp - entity.expire) / 3600) | round(2) }} hours ago)</span>
+ {% else %} (expires in {{ ((entity.expire - date().timestamp) / 3600) | round(2) }} hours){% endif -%}{% endif %}
</li>
{% endfor %}
</ul>
--
GitLab