diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-08-01 22:17:17 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-08-01 22:17:17 +0200 |
| commit | 122898d221262744e05b5f44ca99dcaccc28484f (patch) | |
| tree | ca73e7b3642401a4f1f129618a2c43ef363f2a28 /phpBB | |
| parent | 9a3af2a052eacd384f2d6a4b3e490752f6156da4 (diff) | |
| parent | 8bdfda723cd29cc191a252ee00da7da2fa8c6147 (diff) | |
| download | forums-122898d221262744e05b5f44ca99dcaccc28484f.tar forums-122898d221262744e05b5f44ca99dcaccc28484f.tar.gz forums-122898d221262744e05b5f44ca99dcaccc28484f.tar.bz2 forums-122898d221262744e05b5f44ca99dcaccc28484f.tar.xz forums-122898d221262744e05b5f44ca99dcaccc28484f.zip | |
Merge pull request #2350 from Nicofuma/ticket/11480
[ticket/11480] PM : "Unknown folder" returned when inbox folder is full
* Nicofuma/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
Diffstat (limited to 'phpBB')
| -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 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'); } |