diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2007-07-27 17:01:37 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2007-07-27 17:01:37 +0000 |
| commit | 92c25a3e6c99bb071710b2f5dc5939262924233c (patch) | |
| tree | 8871f65ac15eb1feb05b6e2fc3f07871da3b0fe8 /phpBB/includes/functions_privmsgs.php | |
| parent | 3829c40b5715187c05d919e56fd37e36a9eb9886 (diff) | |
| download | forums-92c25a3e6c99bb071710b2f5dc5939262924233c.tar forums-92c25a3e6c99bb071710b2f5dc5939262924233c.tar.gz forums-92c25a3e6c99bb071710b2f5dc5939262924233c.tar.bz2 forums-92c25a3e6c99bb071710b2f5dc5939262924233c.tar.xz forums-92c25a3e6c99bb071710b2f5dc5939262924233c.zip | |
#13791 - I hope this works :D
git-svn-id: file:///svn/phpbb/trunk@7960 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_privmsgs.php')
| -rw-r--r-- | phpBB/includes/functions_privmsgs.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index 90ffe4a412..ca06e05b39 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -760,7 +760,7 @@ function move_pm($user_id, $message_limit, $move_msg_ids, $dest_folder, $cur_fol } if (sizeof($move_msg_ids) && !in_array($dest_folder, array(PRIVMSGS_NO_BOX, PRIVMSGS_OUTBOX, PRIVMSGS_SENTBOX)) && - !in_array($cur_folder_id, array(PRIVMSGS_NO_BOX, PRIVMSGS_OUTBOX, PRIVMSGS_SENTBOX)) && $cur_folder_id != $dest_folder) + !in_array($cur_folder_id, array(PRIVMSGS_NO_BOX, PRIVMSGS_OUTBOX)) && $cur_folder_id != $dest_folder) { // We have to check the destination folder ;) if ($dest_folder != PRIVMSGS_INBOX) @@ -832,6 +832,10 @@ function move_pm($user_id, $message_limit, $move_msg_ids, $dest_folder, $cur_fol $db->sql_query($sql); } } + } + else if (in_array($cur_folder_id, array(PRIVMSGS_NO_BOX, PRIVMSGS_OUTBOX))) + { + trigger_error('CANNOT_MOVE_SPECIAL'); } return $num_moved; |