diff options
| author | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-03-24 13:54:09 +0000 |
|---|---|---|
| committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-03-24 13:54:09 +0000 |
| commit | 13318620d8931d6b0bb1b820c2765394fbefc1e4 (patch) | |
| tree | 0f177b4c7c06b89e00102a1aefa535f936441b40 /phpBB | |
| parent | 5664a3637b23e84d0b3e4477803cc33a7cc91518 (diff) | |
| download | forums-13318620d8931d6b0bb1b820c2765394fbefc1e4.tar forums-13318620d8931d6b0bb1b820c2765394fbefc1e4.tar.gz forums-13318620d8931d6b0bb1b820c2765394fbefc1e4.tar.bz2 forums-13318620d8931d6b0bb1b820c2765394fbefc1e4.tar.xz forums-13318620d8931d6b0bb1b820c2765394fbefc1e4.zip | |
Fix 'non-deletion' of messages deleted from Outbox under certain circumstances
git-svn-id: file:///svn/phpbb/trunk@2422 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/privmsg.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/privmsg.php b/phpBB/privmsg.php index 879f2ae04e..3ac33748ba 100644 --- a/phpBB/privmsg.php +++ b/phpBB/privmsg.php @@ -751,11 +751,12 @@ else if( ( $delete && $mark_list ) || $delete_all ) { case 'inbox': $delete_sql .= "privmsgs_to_userid = " . $userdata['user_id'] . " AND ( - privmsgs_type = " . PRIVMSGS_READ_MAIL . " OR privmsgs_type = " . PRIVMSGS_NEW_MAIL . " OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )"; + privmsgs_type = " . PRIVMSGS_READ_MAIL . " OR privmsgs_type = " . PRIVMSGS_NEW_MAIL . " OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )"; break; case 'outbox': - $delete_sql .= "privmsgs_from_userid = " . $userdata['user_id'] . " AND privmsgs_type = " . PRIVMSGS_NEW_MAIL; + $delete_sql .= "privmsgs_from_userid = " . $userdata['user_id'] . " AND ( + privmsgs_type = " . PRIVMSGS_NEW_MAIL . " OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )"; break; case 'sentbox': |