From 4e609da2b75f5fe6d694617735cad77014a504f1 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Tue, 23 Jul 2013 10:34:23 -0400
Subject: [PATCH] fix merge

---
 templates/post_thread.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/post_thread.html b/templates/post_thread.html
index 6ec45482..cbd37229 100644
--- a/templates/post_thread.html
+++ b/templates/post_thread.html
@@ -113,7 +113,7 @@
                         <img class="icon" title="Locked" src="{{ config.image_locked }}" alt="Locked" />
                 {% endif %}
         {% endif %}
-        {% if post.bumplocked and (config.mod.view_bumplock < 0 or (post.mod and post.mod|hasPermission(config.mod.view_bump$
+        {% if post.bumplocked and (config.mod.view_bumplock < 0 or (post.mod and post.mod|hasPermission(config.mod.view_bumplock, board.uri))) %}
                 {% if config.font_awesome %}
                         <i class="icon-anchor icon"></i>
                 {% else %}