Merge pull request #1522 from Antes/delete-topic

Delete topic
SimpleMachines · May 8, 2014 · 9a82917 · 9a82917
2 parents 67a6732 + 63259b0
commit 9a82917
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/Themes/default/Display.template.php b/Themes/default/Display.template.php
@@ -912,7 +912,10 @@ function template_single_post($message, $force_alternate = null)
 											<li><a href="', $scripturl, '?action=post;msg=', $message['id'], ';topic=', $context['current_topic'], '.', $context['start'], '" class="modify_button">', $txt['modify'], '</a></li>';
 
 		// How about... even... remove it entirely?!
-		if ($message['can_remove'])
+		if ($context['can_delete'] && ($context['topic_first_message'] == $message['id']))
+			echo '
+											<li><a href="', $scripturl, '?action=removetopic2;topic=', $context['current_topic'], '.', $context['start'], ';', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(\'', $txt['are_sure_remove_topic'], '?\');" class="remove_button">', $txt['remove_topic'],'</a></li>';
+		elseif ($message['can_remove'] && ($context['topic_first_message'] != $message['id']))
 			echo '
 											<li><a href="', $scripturl, '?action=deletemsg;topic=', $context['current_topic'], '.', $context['start'], ';msg=', $message['id'], ';', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(\'', $txt['remove_message'], '?\');" class="remove_button">', $txt['remove'], '</a></li>';