diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-07-30 15:08:04 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-07-30 15:28:02 +0200 |
| commit | 8bdfda723cd29cc191a252ee00da7da2fa8c6147 (patch) | |
| tree | 1c2d16988e15c22f564cbe8fbb425b01c0eabe0d /phpBB | |
| parent | 0ce27eacb1e0ca797cb8722fc3e57fd3ae7bc85f (diff) | |
| download | forums-8bdfda723cd29cc191a252ee00da7da2fa8c6147.tar forums-8bdfda723cd29cc191a252ee00da7da2fa8c6147.tar.gz forums-8bdfda723cd29cc191a252ee00da7da2fa8c6147.tar.bz2 forums-8bdfda723cd29cc191a252ee00da7da2fa8c6147.tar.xz forums-8bdfda723cd29cc191a252ee00da7da2fa8c6147.zip | |
[ticket/11480] Move the test into get_folder()
PHPBB3-11480
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions_privmsgs.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm.php | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index b08d6e7f5c..c99f40d453 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -208,7 +208,7 @@ function get_folder($user_id, $folder_id = false) ); } - if ($folder_id !== false && !isset($folder[$folder_id])) + if ($folder_id !== false && $folder_id !== PRIVMSGS_HOLD_BOX && !isset($folder[$folder_id])) { trigger_error('UNKNOWN_FOLDER'); } diff --git a/phpBB/includes/ucp/ucp_pm.php b/phpBB/includes/ucp/ucp_pm.php index 2a718c0701..447b6ebe87 100644 --- a/phpBB/includes/ucp/ucp_pm.php +++ b/phpBB/includes/ucp/ucp_pm.php @@ -272,12 +272,6 @@ class ucp_pm $folder_id = (int) $row['folder_id']; } - // Do not allow hold messages to be seen - if ($folder_id == PRIVMSGS_HOLD_BOX) - { - trigger_error('NO_AUTH_READ_HOLD_MESSAGE'); - } - $message_row = array(); if ($action == 'view_message' && $msg_id) { |