[Tikiwiki-cvs] tiki/templates comment.tpl,1.8.2.26,1.8.2.27

[<sy...@us...>]

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

Modified Files:
      Tag: BRANCH-1-9
	comment.tpl 
Log Message:
some more check

Index: comment.tpl
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/templates/comment.tpl,v
retrieving revision 1.8.2.26
retrieving revision 1.8.2.27
diff -u -d -r1.8.2.26 -r1.8.2.27
--- comment.tpl	11 Oct 2005 13:39:09 -0000	1.8.2.26
+++ comment.tpl	11 Oct 2005 18:28:29 -0000	1.8.2.27
@@ -76,10 +76,10 @@
 				</td>
 				{/if} {* if ($tiki_p_vote_comments eq 'y' ... *}
 				<td align="right">
-					{if $tiki_p_remove_comments eq 'y' || $tiki_p_admin_forum eq 'y'}
+					{if $tiki_p_remove_comments eq 'y' || ($tiki_p_admin_forum eq 'y' and $forum_mode eq 'y')}
 					  &nbsp;&nbsp;<a title="{tr}delete{/tr}" class="link" href="{$comments_complete_father}comments_threshold={$comments_threshold}&amp;comments_threadId={$comment.threadId}&amp;comments_remove=1&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 src="img/icons2/delete.gif" border="0" width="16" height="16" alt='{tr}Remove{/tr}'></a>
 					{/if}
-					{if $tiki_p_edit_comments eq 'y' || $user == $comment.userName || $tiki_p_admin_forum eq 'y'}
+					{if $tiki_p_edit_comments eq 'y' || $user == $comment.userName || ($tiki_p_admin_forum eq 'y' and $forum_mode eq 'y')}
 					  &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}&amp;edit_reply=1#form"><img border="0" alt="{tr}Edit{/tr}" src="img/icons/edit.gif" /></a>
 					{/if}
 					{if ($tiki_p_post_comments == 'y' and $forum_mode ne 'y') or ($tiki_p_forum_post eq 'y' and $forum_mode eq 'y') }