From 9634368b71564292d2a620e6a5e5ab6d588202a0 Mon Sep 17 00:00:00 2001
From: Benjamin Southall <applemansigloo@gmail.com>
Date: Thu, 1 Jun 2017 07:37:42 +0900
Subject: Add missing post_control template and configuration values for thread
 merge functionality

---
 templates/post/post_controls.html | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'templates')

diff --git a/templates/post/post_controls.html b/templates/post/post_controls.html
index 7e56edd3..eed76702 100644
--- a/templates/post/post_controls.html
+++ b/templates/post/post_controls.html
@@ -48,6 +48,9 @@
 		<a title="{% trans %}Move reply to another board{% endtrans %}" href="?/{{ board.dir }}move_reply/{{ post.id }}">{{ config.mod.link_move }}</a>&nbsp;
 	{% endif %}
 {% endif %}
+{% if mod|hasPermission(config.mod.merge, board.uri) %}
+		<a title="{% trans %}Merge thread with another thread {% endtrans %}" href="?/{{ board.dir }}merge/{{ post.id }}">{{ config.mod.link_merge }}</a>&nbsp;
+{% endif %}
 {% if mod|hasPermission(config.mod.cycle, board.uri) %}
 	{% if post.cycle %}
 	<a title="{% trans %}Make thread not cycle{% endtrans %}" href="?/{{ secure_link(board.dir ~ 'uncycle/' ~ post.id) }}">{{ config.mod.link_uncycle }}</a>&nbsp;
-- 
cgit v1.3