mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 10:16:36 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source 
* develop-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
This commit is contained in:
Joas Schilling
2014-08-01 22:24:06 +02:00
parent 589cf73202 50d10c4efd
commit 76dbe95afc
3 changed files with 141 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/functions_privmsgs.php
View File

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