diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-08-01 22:23:36 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-08-01 22:23:36 +0200 |
| commit | 6ced579ab3a0bf000751cf78facb3a4130d29cea (patch) | |
| tree | f1dd881e61dbd9f72f4d3108b05190f54b45b126 /phpBB | |
| parent | 89557f5cac284e5b59eefdae1af496c7227aa408 (diff) | |
| parent | cd0dad8951b160c91db0178375708dc7a9313ba0 (diff) | |
| download | forums-6ced579ab3a0bf000751cf78facb3a4130d29cea.tar forums-6ced579ab3a0bf000751cf78facb3a4130d29cea.tar.gz forums-6ced579ab3a0bf000751cf78facb3a4130d29cea.tar.bz2 forums-6ced579ab3a0bf000751cf78facb3a4130d29cea.tar.xz forums-6ced579ab3a0bf000751cf78facb3a4130d29cea.zip | |
Merge pull request #2784 from Nicofuma/ticket/11480-ascraeus
[ticket/11480-ascraeus] PM : "Unknown folder" returned when inbox folder is full
* Nicofuma/ticket/11480-ascraeus:
[ticket/11480] Header file
[ticket/11480] Fix unit tests
[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 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'); } |