diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-07-30 21:01:05 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-07-30 21:01:05 +0200 |
| commit | 702d567c69a95b67054ed65848711eacc21fed23 (patch) | |
| tree | d44f7fa6f7c02e838563427366df82a26f35a7ec /phpBB/includes/functions_privmsgs.php | |
| parent | 6d39a5b01505a41035c8c9a8ebcb1ee717b64e7f (diff) | |
| parent | 8bdfda723cd29cc191a252ee00da7da2fa8c6147 (diff) | |
| download | forums-702d567c69a95b67054ed65848711eacc21fed23.tar forums-702d567c69a95b67054ed65848711eacc21fed23.tar.gz forums-702d567c69a95b67054ed65848711eacc21fed23.tar.bz2 forums-702d567c69a95b67054ed65848711eacc21fed23.tar.xz forums-702d567c69a95b67054ed65848711eacc21fed23.zip | |
Merge branch 'ticket/11480' into ticket/11480-ascraeus
* ticket/11480:
[ticket/11480] Move the test into get_folder()
[ticket/11480] Fix the double spaces in phpbb_functional_test_case
[ticket/11480] Fix typos
[ticket/11480] Add functionnal test
[ticket/11480] PM : "Unknown folder" returned when inbox folder is full
Conflicts:
tests/test_framework/phpbb_functional_test_case.php
Diffstat (limited to 'phpBB/includes/functions_privmsgs.php')
| -rw-r--r-- | phpBB/includes/functions_privmsgs.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index e60311f8ab..488f46a398 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -212,7 +212,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'); } |