mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 14:00:31 +02:00
- fixing some minor bugs...
git-svn-id: file:///svn/phpbb/trunk@5203 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -187,6 +187,13 @@ class ucp_pm extends module
|
||||
trigger_error('NO_AUTH_READ_MESSAGE');
|
||||
}
|
||||
|
||||
// Do not allow hold messages to be seen
|
||||
if ($folder_id == PRIVMSGS_HOLD_BOX)
|
||||
{
|
||||
trigger_error('NO_AUTH_READ_HOLD_MESSAGE');
|
||||
}
|
||||
|
||||
|
||||
// First Handle Mark actions and moving messages
|
||||
|
||||
// Move PM
|
||||
|
@@ -432,7 +432,7 @@ function compose_pm($id, $mode, $action)
|
||||
$message_md5 = md5($message_parser->message);
|
||||
|
||||
// Check checksum ... don't re-parse message if the same
|
||||
$update_message = ($action != 'edit' || $message_md5 != $post_checksum || $status_switch || $preview) ? true : false;
|
||||
$update_message = ($action != 'edit' || $message_md5 != $message_checksum || $status_switch || $preview) ? true : false;
|
||||
|
||||
if ($update_message)
|
||||
{
|
||||
|
@@ -206,6 +206,7 @@ function get_pm_from($folder_id, $folder, $user_id, $url, $type = 'folder')
|
||||
if ($type != 'folder')
|
||||
{
|
||||
$folder_sql = ($type == 'unread') ? 't.unread = 1' : 't.new = 1';
|
||||
$folder_sql .= ' AND t.folder_id NOT IN (' . PRIVMSGS_HOLD_BOX . ', ' . PRIVMSGS_NO_BOX . ')';
|
||||
$folder_id = PRIVMSGS_INBOX;
|
||||
}
|
||||
else
|
||||
|
@@ -27,6 +27,12 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
|
||||
trigger_error('NO_AUTH_READ_REMOVED_MESSAGE');
|
||||
}
|
||||
|
||||
// Do not allow hold messages to be seen
|
||||
if ($folder_id == PRIVMSGS_HOLD_BOX)
|
||||
{
|
||||
trigger_error('NO_AUTH_READ_HOLD_MESSAGE');
|
||||
}
|
||||
|
||||
// Grab icons
|
||||
$icons = array();
|
||||
obtain_icons($icons);
|
||||
|
Reference in New Issue
Block a user