makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11480] Move the test into get_folder()

Browse source 
PHPBB3-11480
This commit is contained in:
Tristan Darricau 2014-07-30 15:08:04 +02:00
parent 0ce27eacb1
commit 8bdfda723c
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/functions_privmsgs.php
View file

@ -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'); trigger_error('UNKNOWN_FOLDER');
} }

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

@ -272,12 +272,6 @@ class ucp_pm
$folder_id = (int) $row['folder_id']; $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(); $message_row = array();
if ($action == 'view_message' && $msg_id) if ($action == 'view_message' && $msg_id)
{ {