Changeset 15808 for trunk/xmlrpc/BxDolXMLRPCMessages.php

Timestamp:

12/29/11 05:00:35 (5 months ago)

Author:

Alexander Trofimov

Message:

Ticket #2703

File:

• trunk/xmlrpc/BxDolXMLRPCMessages.php (modified) (1 diff)

trunk/xmlrpc/BxDolXMLRPCMessages.php

@@ -95 +95 @@
 
         $aMsgs = array ();
-        $sWhere = $isInbox ? " `Recipient` = '$iId' " : " `Sender`= '$iId' ";
+
+        if ($isInbox)
+            $sWhere = "`Recipient` = '$iId' AND `Trash` != 'recipient'";
+        else
+            $sWhere = "`Sender` = '$iId' AND `Trash` != 'sender'";
+
         $sJoinOn = $isInbox ? " `m`.`Sender` = `p`.`ID` " : " `m`.`Recipient` = `p`.`ID` ";
         $r = db_res ("SELECT