diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2005-08-19 16:39:46 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2005-08-19 16:39:46 +0000 |
| commit | 269421a22f9b2618925362e07e2350f0739eb745 (patch) | |
| tree | 2d676b732fba9285dc5eaf630f9e83411f82bd90 | |
| parent | 4b9215bd14bc72edeff20a40962d0bd89b21718e (diff) | |
| download | forums-269421a22f9b2618925362e07e2350f0739eb745.tar forums-269421a22f9b2618925362e07e2350f0739eb745.tar.gz forums-269421a22f9b2618925362e07e2350f0739eb745.tar.bz2 forums-269421a22f9b2618925362e07e2350f0739eb745.tar.xz forums-269421a22f9b2618925362e07e2350f0739eb745.zip | |
- fixing some minor bugs...
git-svn-id: file:///svn/phpbb/trunk@5203 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm.php | 7 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewfolder.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewmessage.php | 6 |
4 files changed, 15 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_pm.php b/phpBB/includes/ucp/ucp_pm.php index 9ce0794eca..00b7c0988e 100644 --- a/phpBB/includes/ucp/ucp_pm.php +++ b/phpBB/includes/ucp/ucp_pm.php @@ -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 diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index e1302bf470..5202e1ae32 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -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) { diff --git a/phpBB/includes/ucp/ucp_pm_viewfolder.php b/phpBB/includes/ucp/ucp_pm_viewfolder.php index e83ae095ea..ebed926a25 100644 --- a/phpBB/includes/ucp/ucp_pm_viewfolder.php +++ b/phpBB/includes/ucp/ucp_pm_viewfolder.php @@ -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 diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index 632a148321..f8bbfb10f6 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -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); |