Merge pull request #1138 from Arantor/release-2.1

More bug fixes

Sources/Profile-Actions.php

@@ -592,7 +592,7 @@ function deleteAccount2($memID)
 
 		// Now, have you been naughty and need your posts deleting?
 		// @todo Should this check board permissions?
-		if ($_POST['remove_type'] != 'none' && allowedTo('moderate_forum'))
+		if (!empty($_POST['deletePosts']) && in_array($_POST['remove_type'], array('posts', 'topics')) && allowedTo('moderate_forum'))
 		{
 			// Include RemoveTopics - essential for this type of work!
 			require_once($sourcedir . '/RemoveTopic.php');

Themes/default/ManageMembergroups.template.php

@@ -417,7 +417,7 @@ function template_add_edit_group_boards_list($collapse = true)
 	echo '
 							<fieldset id="visible_boards">
 								<legend>', $txt['membergroups_new_board_desc'], '</legend>
-								<ul class="ignoreboards floatleft">';
+								<ul class="padding floatleft">';
 
 	foreach ($context['categories'] as $category)
 	{

Themes/default/Profile.template.php

@@ -2642,7 +2642,7 @@ function template_deleteAccount()
 	// If deleting another account give them a lovely info box.
 	if (!$context['user']['is_owner'])
 		echo '
-			<p class="windowbg2 description">', $txt['deleteAccount_desc'], '</p>';
+			<p class="information">', $txt['deleteAccount_desc'], '</p>';
 	echo '
 			<div class="windowbg2">
 				<div class="content">';
@@ -2682,9 +2682,8 @@ function template_deleteAccount()
 		if ($context['can_delete_posts'])
 			echo '
 					<div>
-						', $txt['deleteAccount_posts'], ':
+						<label for="deletePosts"><input type="checkbox" name="deletePosts" id="deletePosts" value="1" class="input_check" /> ', $txt['deleteAccount_posts'], ':</label>
 						<select name="remove_type">
-							<option value="none">', $txt['deleteAccount_none'], '</option>
 							<option value="posts">', $txt['deleteAccount_all_posts'], '</option>
 							<option value="topics">', $txt['deleteAccount_topics'], '</option>
 						</select>

Themes/default/languages/Profile.english.php

@@ -184,8 +184,7 @@ $txt['deleteAccount_warning'] = 'Warning - These actions are irreversible!';
 $txt['deleteAccount_desc'] = 'From this page you can delete this user\'s account and posts.';
 $txt['deleteAccount_member'] = 'Delete this member\'s account';
 $txt['deleteAccount_posts'] = 'Remove posts made by this member';
-$txt['deleteAccount_none'] = 'None';
-$txt['deleteAccount_all_posts'] = 'All Posts';
+$txt['deleteAccount_all_posts'] = 'Replies to Topics';
 $txt['deleteAccount_topics'] = 'Topics and Posts';
 $txt['deleteAccount_confirm'] = 'Are you completely sure you want to delete this account?';
 $txt['deleteAccount_approval'] = 'Please note that the forum moderators will have to approve this account\'s deletion before it will be removed.';