From b4c7dbcd66476678e4a9290a1071c0daf2f88968 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 15 Sep 2009 09:45:05 +0000
Subject: [PATCH] Fix #51305 - User need a_clearlog to delete warnings

Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10145 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/adm/style/acp_users_warnings.html | 17 +++++++----------
 phpBB/includes/acp/acp_users.php        |  9 +--------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/phpBB/adm/style/acp_users_warnings.html b/phpBB/adm/style/acp_users_warnings.html
index be9ef06825..d27f3800fc 100644
--- a/phpBB/adm/style/acp_users_warnings.html
+++ b/phpBB/adm/style/acp_users_warnings.html
@@ -7,17 +7,16 @@
 		<th>{L_REPORT_BY}</th>
 		<th>{L_TIME}</th>
 		<th>{L_FEEDBACK}</th>
-		<!-- IF S_CLEARLOGS --><th>{L_MARK}</th><!-- ENDIF -->
+		<th>{L_MARK}</th>
 	</tr>
 	</thead>
 	<tbody>
 	<!-- BEGIN warn -->
 		<!-- IF warn.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-
 			<td>{warn.USERNAME}</td>
 			<td style="text-align: center; nowrap: nowrap;">{warn.DATE}</td>
 			<td>{warn.ACTION}</td>
-			<!-- IF S_CLEARLOGS --><td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{warn.ID}" /></td><!-- ENDIF -->
+			<td style="text-align: center;"><input type="checkbox" class="radio" name="mark[]" value="{warn.ID}" /></td>
 		</tr>
 	<!-- END warn -->
 	</tbody>
@@ -28,12 +27,10 @@
 		</div>
 	<!-- ENDIF -->
 
-	<!-- IF S_CLEARLOGS -->
-		<fieldset class="quick">
-			<input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" />&nbsp;
-			<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" />
-			<p class="small"><a href="#" onclick="marklist('list', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('list', 'mark', false);">{L_UNMARK_ALL}</a></p>
-		</fieldset>
-	<!-- ENDIF -->
+	<fieldset class="quick">
+		<input class="button2" type="submit" name="delall" value="{L_DELETE_ALL}" />&nbsp;
+		<input class="button2" type="submit" name="delmarked" value="{L_DELETE_MARKED}" />
+		<p class="small"><a href="#" onclick="marklist('list', 'mark', true);">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('list', 'mark', false);">{L_UNMARK_ALL}</a></p>
+	</fieldset>
 	{S_FORM_TOKEN}
 	</form>
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 1afec6183a..4b7c034433 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -1167,13 +1167,7 @@ class acp_users
 						$deleteall = request_var('delall', 0);
 						if ($deletemark && $marked)
 						{
-							$sql_in = array();
-							foreach ($marked as $mark)
-							{
-								$sql_in[] = $mark;
-							}
-							$where_sql = ' AND ' . $db->sql_in_set('warning_id', $sql_in);
-							unset($sql_in);
+							$where_sql = ' AND ' . $db->sql_in_set('warning_id', array_values($marked));
 						}
 
 						if ($where_sql || $deleteall)
@@ -1291,7 +1285,6 @@ class acp_users
 
 				$template->assign_vars(array(
 					'S_WARNINGS'	=> true,
-					'S_CLEARLOGS'	=> $auth->acl_get('a_clearlogs'),
 				));
 
 			break;