diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2005-05-01 13:15:49 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2005-05-01 13:15:49 +0000 |
| commit | 16e50db4baf39877fe3e02a13dfc57983b12f414 (patch) | |
| tree | d0056ef4cc56c15ed361d39dea5093fb30cd1989 /phpBB/includes/ucp/ucp_pm.php | |
| parent | be3bdf61d778928916942c07c6d60968fddf9d18 (diff) | |
| download | forums-16e50db4baf39877fe3e02a13dfc57983b12f414.tar forums-16e50db4baf39877fe3e02a13dfc57983b12f414.tar.gz forums-16e50db4baf39877fe3e02a13dfc57983b12f414.tar.bz2 forums-16e50db4baf39877fe3e02a13dfc57983b12f414.tar.xz forums-16e50db4baf39877fe3e02a13dfc57983b12f414.zip | |
- some private message fixes
git-svn-id: file:///svn/phpbb/trunk@5139 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm.php | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/phpBB/includes/ucp/ucp_pm.php b/phpBB/includes/ucp/ucp_pm.php index ee67746592..9ce0794eca 100644 --- a/phpBB/includes/ucp/ucp_pm.php +++ b/phpBB/includes/ucp/ucp_pm.php @@ -132,9 +132,11 @@ class ucp_pm extends module FROM ' . GROUPS_TABLE . ' WHERE group_id = ' . $user->data['group_id']; $result = $db->sql_query($sql); - $user->data['group_message_limit'] = (int) $db->sql_fetchfield('group_message_limit', 0, $result); + $message_limit = (int) $db->sql_fetchfield('group_message_limit', 0, $result); $db->sql_freeresult($result); + $user->data['message_limit'] = (!$message_limit) ? $config['pm_max_msgs'] : $message_limit; + get_folder($user->data['user_id'], $folder); include($phpbb_root_path . 'includes/ucp/ucp_pm_options.'.$phpEx); @@ -156,9 +158,11 @@ class ucp_pm extends module FROM ' . GROUPS_TABLE . ' WHERE group_id = ' . $user->data['group_id']; $result = $db->sql_query($sql); - $user->data['group_message_limit'] = (int) $db->sql_fetchfield('group_message_limit', 0, $result); + $message_limit = (int) $db->sql_fetchfield('group_message_limit', 0, $result); $db->sql_freeresult($result); - + + $user->data['message_limit'] = (!$message_limit) ? $config['pm_max_msgs'] : $message_limit; + if ($folder_specified) { $folder_id = $folder_specified; @@ -188,13 +192,11 @@ class ucp_pm extends module // Move PM if (isset($_REQUEST['move_pm'])) { - $message_limit = (!$user->data['group_message_limit']) ? $config['pm_max_msgs'] : $user->data['group_message_limit']; - $move_msg_ids = (isset($_POST['marked_msg_id'])) ? array_map('intval', $_POST['marked_msg_id']) : array(); $dest_folder = request_var('dest_folder', PRIVMSGS_NO_BOX); $cur_folder_id = request_var('cur_folder_id', PRIVMSGS_NO_BOX); - if (move_pm($user->data['user_id'], $message_limit, $move_msg_ids, $dest_folder, $cur_folder_id)) + if (move_pm($user->data['user_id'], $user->data['message_limit'], $move_msg_ids, $dest_folder, $cur_folder_id)) { // Return to folder view if single message moved if ($action == 'view_message') @@ -219,7 +221,7 @@ class ucp_pm extends module place_pm_into_folder($global_privmsgs_rules, request_var('release', 0)); $num_not_moved = $user->data['user_new_privmsg']; } - + if (!$msg_id && $folder_id == PRIVMSGS_NO_BOX && $mode != 'unread') { $folder_id = PRIVMSGS_INBOX; |