From: Joey Hess <joeyh@joeyh.name>
Date: Fri, 8 Apr 2016 18:10:56 +0000 (-0400)
Subject: fix duplicate expansion of comments
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/refs/heads/bootstrap

fix duplicate expansion of comments

This caused an uninitiaied value warning, since inline deletes the cache of
content on the first expansion.
---

diff --git a/templates/page.tmpl b/templates/page.tmpl
index 572e89175..1e430649d 100644
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -263,26 +263,20 @@
 <TMPL_IF COMMENTS>
 <TMPL_UNLESS THEME_BOOTSTRAP>
 <TMPL_IF HTML5><section<TMPL_ELSE><div</TMPL_IF> id="comments" role="complementary">
-<TMPL_VAR COMMENTS>
 <TMPL_ELSE>
 <section id="comments" title="Comments">
-<a href="<TMPL_VAR ADDCOMMENTURL>" class="btn btn-primary">Add a comment</a>
-<TMPL_VAR COMMENTS>
 </TMPL_UNLESS>
+<TMPL_VAR COMMENTS>
 <TMPL_IF ADDCOMMENTURL>
-<TMPL_UNLESS THEME_BOOTSTRAP>
 <div class="addcomment">
 <a href="<TMPL_VAR ADDCOMMENTURL>">Add a comment</a>
 </div>
-</TMPL_UNLESS>
 <TMPL_ELSE>
 <div class="addcomment">Comments on this page are closed.</div>
 </TMPL_IF>
 <TMPL_UNLESS THEME_BOOTSTRAP>
 <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF>
-<TMPL_VAR COMMENTS>
 <TMPL_ELSE>
-<TMPL_VAR COMMENTS>
 </section>
 </TMPL_UNLESS>
 </TMPL_IF>