From 1ba516a052b30c0875d72c8aea468cc5153c3fa6 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Mon, 26 May 2014 23:59:27 +0200
Subject: [PATCH] [ticket/11942] Don't show the checkbox if the post is already
 soft-deleted

PHPBB3-11942
---
 phpBB/styles/prosilver/template/confirm_delete_body.html  | 4 ++--
 phpBB/styles/subsilver2/template/confirm_delete_body.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/styles/prosilver/template/confirm_delete_body.html b/phpBB/styles/prosilver/template/confirm_delete_body.html
index df06020325..f164b5f357 100644
--- a/phpBB/styles/prosilver/template/confirm_delete_body.html
+++ b/phpBB/styles/prosilver/template/confirm_delete_body.html
@@ -2,7 +2,7 @@
 	<form action="{S_CONFIRM_ACTION}" method="post">
 		<p>{MESSAGE_TEXT}</p>
 
-		<!-- IF S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE -->
+		<!-- IF not S_SOFTDELETED and S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE -->
 			<label>
 				<strong>{L_DELETE_PERMANENTLY}{L_COLON}</strong>
 				<input id="delete_permanent" name="delete_permanent" type="checkbox" value="1" {S_CHECKED_PERMANENT} />
@@ -34,7 +34,7 @@
 	<p>{MESSAGE_TEXT}</p>
 
 	<fieldset class="fields1">
-		<!-- IF S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE -->
+		<!-- IF not S_SOFTDELETED and S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE -->
 			<dl>
 				<dt><label for="delete_permanent">{L_DELETE_PERMANENTLY}{L_COLON}</label></dt>
 				<dd>
diff --git a/phpBB/styles/subsilver2/template/confirm_delete_body.html b/phpBB/styles/subsilver2/template/confirm_delete_body.html
index a77534c139..18df397fc3 100644
--- a/phpBB/styles/subsilver2/template/confirm_delete_body.html
+++ b/phpBB/styles/subsilver2/template/confirm_delete_body.html
@@ -15,7 +15,7 @@
 			<br />
 
 			<table border="0" width="90%" cellspacing="2" cellpadding="1">
-			<!-- IF S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE -->
+			<!-- IF not S_SOFTDELETED and S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE -->
 				<tr>
 					<td class="row1" width="22%"><b class="gen">{L_DELETE_PERMANENTLY}{L_COLON}</b></td>
 					<td class="row1" width="78%">