From 6b556e52a27e0b88a46b808f7b78e6f9b9e31dcd Mon Sep 17 00:00:00 2001 From: "torrent.rus.ec@gmail.com" Date: Tue, 23 Aug 2011 01:11:27 +0000 Subject: [PATCH] r249 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Фикс переменной git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@249 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293 --- upload/attach_mod/includes/functions_includes.php | 2 +- upload/config.php | 4 ++-- upload/includes/ucp/usercp_register.php | 6 +++--- upload/templates/default/usercp_register.tpl | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/upload/attach_mod/includes/functions_includes.php b/upload/attach_mod/includes/functions_includes.php index ca53ee7ca..0c3268e56 100644 --- a/upload/attach_mod/includes/functions_includes.php +++ b/upload/attach_mod/includes/functions_includes.php @@ -166,7 +166,7 @@ function attachment_quota_settings($admin_mode, $submit = false, $mode) )); } - if ($admin_mode == 'user' && $submit && @$_POST['deleteuser']) + if ($admin_mode == 'user' && $submit && @$_POST['delete_user']) { process_quota_settings($admin_mode, $user_id, QUOTA_UPLOAD_LIMIT, 0); process_quota_settings($admin_mode, $user_id, QUOTA_PM_LIMIT, 0); diff --git a/upload/config.php b/upload/config.php index a8ed23f27..4f7f83a26 100644 --- a/upload/config.php +++ b/upload/config.php @@ -57,8 +57,8 @@ $bb_cfg['css_ver'] = 1; // Increase number of revision after update $bb_cfg['tp_version'] = '2.1 Stable'; -$bb_cfg['tp_release_state'] = 'R248'; -$bb_cfg['tp_release_date'] = '22-08-2011'; +$bb_cfg['tp_release_state'] = 'R249'; +$bb_cfg['tp_release_date'] = '23-08-2011'; $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger $bb_cfg['srv_overloaded_msg'] = "Извините, в данный момент сервер перегружен\nПопробуйте повторить запрос через несколько минут"; diff --git a/upload/includes/ucp/usercp_register.php b/upload/includes/ucp/usercp_register.php index 0e3457a9d..e4a78bac4 100644 --- a/upload/includes/ucp/usercp_register.php +++ b/upload/includes/ucp/usercp_register.php @@ -848,7 +848,7 @@ if ($submit && !$errors) require(INC_DIR .'functions_admin.php'); $del_msg = false; - if (!empty($_POST['deleteuser'])) + if (!empty($_POST['delete_user'])) { delete_user_sessions($pr_data['user_id']); user_delete($pr_data['user_id'], !empty($_POST['delete_user_posts'])); @@ -858,12 +858,12 @@ if ($submit && !$errors) $datastore->update('moderators'); } - $del_msg = $lang['USER_DELETED']; + $del_msg .= $lang['USER_DELETED']; } if (!empty($_POST['delete_user_posts'])) { post_delete('user', $pr_data['user_id']); - $del_msg = $lang['USER_DELETED_POSTS']; + $del_msg .= ($del_msg) ? '

'. $lang['USER_DELETED_POSTS'] : $lang['USER_DELETED_POSTS']; } if($del_msg) bb_die($del_msg); } diff --git a/upload/templates/default/usercp_register.tpl b/upload/templates/default/usercp_register.tpl index b18537dd4..01ce1f7d1 100644 --- a/upload/templates/default/usercp_register.tpl +++ b/upload/templates/default/usercp_register.tpl @@ -295,7 +295,7 @@ ajax.callback.posts = function(data){ {L_USER_DELETE}? - +