Changeset 13125
- Timestamp:
- 11/01/09 23:40:06 (3 weeks ago)
- Files:
-
- trunk/inc/classes/BxDolMailBox.php (modified) (2 diffs)
- trunk/templates/base/scripts/BxBaseMailBox.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/inc/classes/BxDolMailBox.php
r13019 r13125 822 822 823 823 $sMessageSubject = process_db_input($sMessageSubject, BX_TAGS_STRIP); 824 $sMessageBody = process_db_input($sMessage Subject, BX_TAGS_VALIDATE);825 826 $sMessageBody = nl2br( urldecode($sMessageBody) ); 824 $sMessageBody = process_db_input($sMessageBody, BX_TAGS_VALIDATE); 825 $sMessageBody = nl2br( urldecode($sMessageBody) ); 826 827 827 $sQuery = 828 828 " … … 975 975 `sys_messages` 976 976 WHERE 977 977 ( 978 978 `Sender` = {$iMemberId} 979 OR 980 `Recipient` = {$iMemberId} 981 ) 982 AND 983 ( 984 FIND_IN_SET('Recipient', `Trash`) 985 OR 979 AND 986 980 FIND_IN_SET('Sender', `Trash`) 987 981 ) 988 {$sExtraQuery} 982 OR 983 ( 984 `Recipient` = {$iMemberId} 985 AND 986 FIND_IN_SET('Recipient', `Trash`) 987 ) 988 {$sExtraQuery} 989 989 "; 990 990 trunk/templates/base/scripts/BxBaseMailBox.php
r12720 r13125 1703 1703 1704 1704 // get count of inbox messages; 1705 $iInboxCount = BxDolMailBox::getCountInboxMessages($iMemberId , '1');1705 $iInboxCount = BxDolMailBox::getCountInboxMessages($iMemberId); 1706 1706 1707 1707 // get count of sent messages ;
