From 5764700be88779478813edf3cd05a438293d5ef8 Mon Sep 17 00:00:00 2001
From: Fidel Ramos <f@fidelramos.net>
Date: Thu, 31 Oct 2019 22:06:17 +0000
Subject: [PATCH] Refactor get_target macro to make conditions more explicit

---
 templates/base.html | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/templates/base.html b/templates/base.html
index 1669f05..2470da3 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -109,12 +109,16 @@
         <ul class="list">
           {# Open links in new window depending on the LINKS_IN_NEW_TAB setting #}
           {% macro get_target(link) -%}
-            {% if LINKS_IN_NEW_TAB not in ('no', 'none', false, 0, 'external') or (LINKS_IN_NEW_TAB == "external" and not link.startswith("/") and not link.startswith(SITEURL)) %}
+            {%- if LINKS_IN_NEW_TAB is not defined -%}
             _blank
-            {% else %}
+            {%- elif LINKS_IN_NEW_TAB in ('all', none, true) -%}
+            _blank
+            {%- elif LINKS_IN_NEW_TAB == "external" and not link.startswith("/") and not link.startswith(SITEURL) -%}
+            _blank
+            {%- else -%}
             _self
-            {% endif %}
-          {% endmacro %}
+            {%- endif -%}
+          {%- endmacro %}
 
           {% if PAGES_SORT_ATTRIBUTE -%}
             {% set pages = pages|sort(attribute=PAGES_SORT_ATTRIBUTE) %}