Changeset 13125

Timestamp:

11/01/09 23:40:06 (2 years ago)

Author:

Alexander Ermashev

Message:

• ticket #1377;

Location:

trunk

Files:

• inc/classes/BxDolMailBox.php (modified) (2 diffs)
• templates/base/scripts/BxBaseMailBox.php (modified) (1 diff)

trunk/inc/classes/BxDolMailBox.php

@@ -822 +822 @@
 
                     $sMessageSubject  = process_db_input($sMessageSubject, BX_TAGS_STRIP);
-                    $sMessageBody     = process_db_input($sMessageSubject, BX_TAGS_VALIDATE);
-
-                    $sMessageBody = nl2br( urldecode($sMessageBody) );
+                    $sMessageBody     = process_db_input($sMessageBody, BX_TAGS_VALIDATE);
+                    $sMessageBody     = nl2br( urldecode($sMessageBody) );
+
                     $sQuery = 
                     "
@@ -975 +975 @@
                     `sys_messages` 
                 WHERE 
-                    (
+                    (
                         `Sender` = {$iMemberId}
-                            OR
-                        `Recipient` = {$iMemberId}
-                    )
-                        AND
-                    (    
-                        FIND_IN_SET('Recipient', `Trash`)
-                            OR
+                            AND
                         FIND_IN_SET('Sender', `Trash`)
                     )
-                        {$sExtraQuery}
+                        OR
+                    (                           
+                        `Recipient` = {$iMemberId}
+                            AND
+                        FIND_IN_SET('Recipient', `Trash`)
+                    )
+                    {$sExtraQuery}
             ";
 

trunk/templates/base/scripts/BxBaseMailBox.php

@@ -1703 +1703 @@
 
             // get count of inbox messages;
-            $iInboxCount = BxDolMailBox::getCountInboxMessages($iMemberId, '1');
+            $iInboxCount = BxDolMailBox::getCountInboxMessages($iMemberId);
 
             // get count of sent messages ;