makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixing some minor bugs...

Browse source 
git-svn-id: file:///svn/phpbb/trunk@5203 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2005-08-19 16:39:46 +00:00
parent 4b9215bd14
commit 269421a22f
4 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/includes/ucp/ucp_pm.php
View file

@ -187,6 +187,13 @@ class ucp_pm extends module
trigger_error('NO_AUTH_READ_MESSAGE'); 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 // First Handle Mark actions and moving messages
// Move PM // Move PM

2
phpBB/includes/ucp/ucp_pm_compose.php
View file

@ -432,7 +432,7 @@ function compose_pm($id, $mode, $action)
$message_md5 = md5($message_parser->message); $message_md5 = md5($message_parser->message);
// Check checksum ... don't re-parse message if the same // 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) if ($update_message)
{ {

1
phpBB/includes/ucp/ucp_pm_viewfolder.php
View file

@ -206,6 +206,7 @@ function get_pm_from($folder_id, $folder, $user_id, $url, $type = 'folder')
if ($type != 'folder') if ($type != 'folder')
{ {
$folder_sql = ($type == 'unread') ? 't.unread = 1' : 't.new = 1'; $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; $folder_id = PRIVMSGS_INBOX;
} }
else else

6
phpBB/includes/ucp/ucp_pm_viewmessage.php
View file

@ -27,6 +27,12 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
trigger_error('NO_AUTH_READ_REMOVED_MESSAGE'); 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 // Grab icons
$icons = array(); $icons = array();
obtain_icons($icons); obtain_icons($icons);