[Phpbb-checkins] CVS: phpBB2 privmsg.php,1.91,1.92

[Paul S. O. <ps...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv11546

Modified Files:
	privmsg.php 
Log Message:
Fix 'non-deletion' of messages deleted from Outbox under certain circumstances 

Index: privmsg.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/privmsg.php,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -r1.91 -r1.92
*** privmsg.php	22 Mar 2002 23:17:04 -0000	1.91
--- privmsg.php	24 Mar 2002 13:54:09 -0000	1.92
***************
*** 752,760 ****
  				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 . " )";
  					break;
  
  				case 'outbox':
! 					$delete_sql .= "privmsgs_from_userid = " . $userdata['user_id'] . " AND privmsgs_type = " . PRIVMSGS_NEW_MAIL;
  					break;
  
--- 752,761 ----
  				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 . " )";
  					break;
  
  				case 'outbox':
! 					$delete_sql .= "privmsgs_from_userid = " . $userdata['user_id'] . " AND ( 
! 						privmsgs_type = " . PRIVMSGS_NEW_MAIL . " OR privmsgs_type = " . PRIVMSGS_UNREAD_MAIL . " )";
  					break;