[Tikiwiki-cvs] tiki/templates comment.tpl,1.8,1.9 comments.tpl,1.44,1.45

[<rlp...@us...>]

Update of /cvsroot/tikiwiki/tiki/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27171/templates

Modified Files:
	comment.tpl comments.tpl 
Log Message:
Fixed a serious forum bug.  See tikiwiki-devel.




Index: comment.tpl
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/templates/comment.tpl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- comment.tpl	19 Jun 2004 14:54:11 -0000	1.8
+++ comment.tpl	22 Jun 2004 22:25:46 -0000	1.9
@@ -34,7 +34,11 @@
 			  			&nbsp;&nbsp;<a title="{tr}edit{/tr}" class="link" href="{$comments_complete_father}comments_threadId={$comment.threadId}&amp;comments_threshold={$comments_threshold}&amp;comments_offset={$comments_offset}&amp;comments_sort_mode={$comments_sort_mode}&amp;comments_maxComments={$comments_maxComments}&amp;comments_parentId={$comments_parentId}&amp;comments_style={$comments_style}"><img border="0" alt="{tr}Edit{/tr}" src="img/icons/edit.gif" /></a>
 			  		{/if}
 		{if $tiki_p_post_comments == 'y'}
-  		<a class="linkbut" href="{$comments_complete_father}comments_threshold={$comments_threshold}&amp;comments_reply_threadId={$comment.threadId}&amp;comments_offset={$comments_offset}&amp;comments_sort_mode={$comments_sort_mode}&amp;comments_maxComments={$comments_maxComments}&amp;comments_parentId={$comment.threadId}&amp;comments_style={$comments_style}&amp;post_reply=1#form">{tr}reply{/tr}</a>
+		    {if $comments_grandParentId}
+			<a class="linkbut" href="{$comments_complete_father}comments_threshold={$comments_threshold}&amp;comments_reply_threadId={$comment.threadId}&amp;comments_offset={$comments_offset}&amp;comments_sort_mode={$comments_sort_mode}&amp;comments_maxComments={$comments_maxComments}&amp;comments_grandParentId={$comments_grandParentId}&amp;comments_parentId={$comment.threadId}&amp;comments_style={$comments_style}&amp;post_reply=1#form">{tr}reply{/tr}</a>
+		    {else}
+			<a class="linkbut" href="{$comments_complete_father}comments_threshold={$comments_threshold}&amp;comments_reply_threadId={$comment.threadId}&amp;comments_offset={$comments_offset}&amp;comments_sort_mode={$comments_sort_mode}&amp;comments_maxComments={$comments_maxComments}&amp;comments_grandParentId={$comment.parentId}&amp;comments_parentId={$comment.threadId}&amp;comments_style={$comments_style}&amp;post_reply=1#form">{tr}reply{/tr}</a>
+		    {/if}
 		{/if}
 			  	</td>
 {/if}

Index: comments.tpl
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/templates/comments.tpl,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- comments.tpl	15 Jun 2004 05:06:30 -0000	1.44
+++ comments.tpl	22 Jun 2004 22:25:46 -0000	1.45
@@ -16,6 +16,8 @@
   <input type="hidden" name="{$comments_request_data[i].name|escape}" value="{$comments_request_data[i].value|escape}" />
   {/section}
   <input type="hidden" name="comments_parentId" value="{$comments_parentId|escape}" />    
+  <input type="hidden" name="comments_grandParentId" value="{$comments_grandParentId|escape}" />    
+  <input type="hidden" name="comments_reply_threadId" value="{$comments_reply_threadId|escape}" />    
   <input type="hidden" name="comments_offset" value="0" />
   <table class="normal">
   <caption> {tr}Posted comments{/tr} </caption>
@@ -134,6 +136,8 @@
 
 
     <form method="post" action="{$comments_father}" id='editpostform'>
+    <input type="hidden" name="comments_reply_threadId" value="{$comments_reply_threadId|escape}" />    
+    <input type="hidden" name="comments_grandParentId" value="{$comments_grandParentId|escape}" />    
     <input type="hidden" name="comments_parentId" value="{$comments_parentId|escape}" />
     <input type="hidden" name="comments_offset" value="{$comments_offset|escape}" />
     <input type="hidden" name="comments_threadId" value="{$comments_threadId|escape}" />