From 54016d0ec85b3521111c3f6a2b010367a961dda9 Mon Sep 17 00:00:00 2001
From: nanosimbiot <nanosimbiot@a8ac35ab-4ca4-ca47-4c2d-a49a94f06293>
Date: Tue, 23 Aug 2011 00:10:36 +0000
Subject: [PATCH] r248
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

фикс одновременного удаления пользователя с его постами git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@248 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
---
 upload/config.php                       | 2 +-
 upload/includes/ucp/usercp_register.php | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/upload/config.php b/upload/config.php
index 4f1c37a9a..a8ed23f27 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -57,7 +57,7 @@ $bb_cfg['css_ver'] = 1;
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.1 Stable';
-$bb_cfg['tp_release_state'] = 'R245';
+$bb_cfg['tp_release_state'] = 'R248';
 $bb_cfg['tp_release_date'] = '22-08-2011';
 
 $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger
diff --git a/upload/includes/ucp/usercp_register.php b/upload/includes/ucp/usercp_register.php
index 3752c2c98..0e3457a9d 100644
--- a/upload/includes/ucp/usercp_register.php
+++ b/upload/includes/ucp/usercp_register.php
@@ -847,6 +847,7 @@ if ($submit && !$errors)
 		{
 			require(INC_DIR .'functions_admin.php');
 
+			$del_msg = false;
 			if (!empty($_POST['deleteuser']))
 			{
 				delete_user_sessions($pr_data['user_id']);
@@ -857,13 +858,14 @@ if ($submit && !$errors)
 					$datastore->update('moderators');
 				}
 
-				bb_die($lang['USER_DELETED']);
+				$del_msg = $lang['USER_DELETED'];
 			}
-			else if (!empty($_POST['delete_user_posts']))
+			if (!empty($_POST['delete_user_posts']))
 			{
 				post_delete('user', $pr_data['user_id']);
-				bb_die($lang['USER_DELETED_POSTS']);
+				$del_msg = $lang['USER_DELETED_POSTS'];
 			}
+			if($del_msg) bb_die($del_msg);
 		}
 
 		// если что-то было изменено