From 39f542704b4df6c302915b0b21e283906bf58ed1 Mon Sep 17 00:00:00 2001
From: ctrlcctrlv <wizardchan@hush.com>
Date: Fri, 9 Aug 2013 19:52:19 +0000
Subject: Option to have a message on the ban page

Conflicts:
	inc/config.php
---
 templates/banned.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'templates/banned.html')

diff --git a/templates/banned.html b/templates/banned.html
index e7b626f6..b052cd41 100644
--- a/templates/banned.html
+++ b/templates/banned.html
@@ -76,6 +76,8 @@
 		</span>
 	</p>
 	<p>{% trans %}Your IP address is{% endtrans %} <strong>{{ ban.ip }}</strong>.</p>
+
+	<p>{{ config.ban_page_message }}</p>
 </div>
 {% endfilter %}
 
-- 
cgit v1.3


From 9ee598ee81cc89c3857b9a1d78a4f994afa8d8a8 Mon Sep 17 00:00:00 2001
From: ctrlcctrlv <wizardchan@hush.com>
Date: Fri, 9 Aug 2013 19:55:25 +0000
Subject: Option to have a message on the ban page

---
 templates/banned.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'templates/banned.html')

diff --git a/templates/banned.html b/templates/banned.html
index b052cd41..401c36e5 100644
--- a/templates/banned.html
+++ b/templates/banned.html
@@ -77,7 +77,9 @@
 	</p>
 	<p>{% trans %}Your IP address is{% endtrans %} <strong>{{ ban.ip }}</strong>.</p>
 
-	<p>{{ config.ban_page_message }}</p>
+	{% if config.ban_page_message %}
+		<p>{{ config.ban_page_message }}</p>
+	{% endif %}
 </div>
 {% endfilter %}
 
-- 
cgit v1.3


From aecfc37510f298571f346c0e1008c089d25a7fd2 Mon Sep 17 00:00:00 2001
From: Michael Foster <savetheinternet@tinyboard.org>
Date: Sun, 11 Aug 2013 21:30:02 +1000
Subject: Rename ban_page_message to ban_page_extra

---
 templates/banned.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'templates/banned.html')

diff --git a/templates/banned.html b/templates/banned.html
index 401c36e5..a4498cf5 100644
--- a/templates/banned.html
+++ b/templates/banned.html
@@ -77,8 +77,8 @@
 	</p>
 	<p>{% trans %}Your IP address is{% endtrans %} <strong>{{ ban.ip }}</strong>.</p>
 
-	{% if config.ban_page_message %}
-		<p>{{ config.ban_page_message }}</p>
+	{% if config.ban_page_extra %}
+		<p>{{ config.ban_page_extra }}</p>
 	{% endif %}
 </div>
 {% endfilter %}
-- 
cgit v1.3