From 814d10fe5e6bd1bd883f1a989f3705aa791f2a93 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Mon, 26 May 2014 23:35:47 +0200
Subject: [PATCH] [ticket/11942] Remove useless IF in templates

PHPBB3-11942
---
 .../template/confirm_delete_body.html         | 24 ++++++--------
 .../template/confirm_delete_body.html         | 33 +++++++++----------
 2 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/phpBB/styles/prosilver/template/confirm_delete_body.html b/phpBB/styles/prosilver/template/confirm_delete_body.html
index 31dd9896cc..df06020325 100644
--- a/phpBB/styles/prosilver/template/confirm_delete_body.html
+++ b/phpBB/styles/prosilver/template/confirm_delete_body.html
@@ -2,21 +2,19 @@
 	<form action="{S_CONFIRM_ACTION}" method="post">
 		<p>{MESSAGE_TEXT}</p>
 
-		<!-- IF not S_SOFTDELETED and S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE -->
-			<!-- IF 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} />
-					<!-- IF S_TOPIC_MODE -->{L_DELETE_TOPIC_PERMANENTLY}<!-- ELSE -->{L_DELETE_POST_PERMANENTLY}<!-- ENDIF -->
-				</label>
-			<!-- ENDIF -->
-
-			<label for="delete_reason">
-				<strong>{L_DELETE_REASON}{L_COLON}</strong><br /><span>{L_DELETE_REASON_EXPLAIN}</span><br />
-				<input type="text" name="delete_reason" value="" class="inputbox autowidth" maxlength="120" size="45" />
+		<!-- IF 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} />
+				<!-- IF S_TOPIC_MODE -->{L_DELETE_TOPIC_PERMANENTLY}<!-- ELSE -->{L_DELETE_POST_PERMANENTLY}<!-- ENDIF -->
 			</label>
 		<!-- ENDIF -->
 
+		<label for="delete_reason">
+			<strong>{L_DELETE_REASON}{L_COLON}</strong><br /><span>{L_DELETE_REASON_EXPLAIN}</span><br />
+			<input type="text" name="delete_reason" value="" class="inputbox autowidth" maxlength="120" size="45" />
+		</label>
+
 		<fieldset class="submit-buttons">
 			<input type="button" name="confirm" value="{L_YES}" class="button1" />&nbsp;
 			<input type="button" name="cancel" value="{L_NO}" class="button2" />
@@ -35,7 +33,6 @@
 
 	<p>{MESSAGE_TEXT}</p>
 
-	<!-- IF not S_SOFTDELETED and S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE -->
 	<fieldset class="fields1">
 		<!-- IF S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE -->
 			<dl>
@@ -54,7 +51,6 @@
 			<dd><input type="text" name="delete_reason" id="delete_reason" value="" class="inputbox autowidth" maxlength="120" size="45" /></dd>
 		</dl>
 	</fieldset>
-	<!-- ENDIF -->
 
 	<fieldset class="submit-buttons">
 		{S_HIDDEN_FIELDS}
diff --git a/phpBB/styles/subsilver2/template/confirm_delete_body.html b/phpBB/styles/subsilver2/template/confirm_delete_body.html
index a6874456cc..a77534c139 100644
--- a/phpBB/styles/subsilver2/template/confirm_delete_body.html
+++ b/phpBB/styles/subsilver2/template/confirm_delete_body.html
@@ -14,24 +14,23 @@
 			<p class="gen">{MESSAGE_TEXT}</p>
 			<br />
 
-			<!-- IF not S_SOFTDELETED and S_ALLOWED_DELETE and S_ALLOWED_SOFTDELETE -->
-				<table border="0" width="90%" cellspacing="2" cellpadding="1">
-				<!-- IF 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%">
-							<input id="delete_permanent" name="delete_permanent" type="checkbox" value="1" {S_CHECKED_PERMANENT} />
-							<!-- IF S_TOPIC_MODE -->{L_DELETE_TOPIC_PERMANENTLY}<!-- ELSE -->{L_DELETE_POST_PERMANENTLY}<!-- ENDIF -->
-						</td>
-					</tr>
-				<!-- ENDIF -->
-					<tr>
-						<td class="row1" valign="top"><span class="gen"><b>{L_DELETE_REASON}{L_COLON}</b></span><br /><span class="gensmall">{L_DELETE_REASON_EXPLAIN}</span></td>
-						<td class="row1"><input type="text" name="delete_reason" value="" class="inputbox autowidth" maxlength="120" size="45" /></td>
-					</tr>
-				</table>
-				<br />
+			<table border="0" width="90%" cellspacing="2" cellpadding="1">
+			<!-- IF 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%">
+						<input id="delete_permanent" name="delete_permanent" type="checkbox" value="1" {S_CHECKED_PERMANENT} />
+						<!-- IF S_TOPIC_MODE -->{L_DELETE_TOPIC_PERMANENTLY}<!-- ELSE -->{L_DELETE_POST_PERMANENTLY}<!-- ENDIF -->
+					</td>
+				</tr>
 			<!-- ENDIF -->
+				<tr>
+					<td class="row1" valign="top"><span class="gen"><b>{L_DELETE_REASON}{L_COLON}</b></span><br /><span class="gensmall">{L_DELETE_REASON_EXPLAIN}</span></td>
+					<td class="row1"><input type="text" name="delete_reason" value="" class="inputbox autowidth" maxlength="120" size="45" /></td>
+				</tr>
+			</table>
+			<br />
+
 			{S_HIDDEN_FIELDS}
 			<input type="submit" name="confirm" value="{L_YES}" class="btnmain" />&nbsp;&nbsp;
 			<input type="submit" name="cancel" value="{L_NO}" class="btnlite" />