Changeset 2597

Timestamp:

04/20/10 09:31:32 (14 years ago)

Author:

amuller

Message:

Ticket #1047 - Não puxar o corpo quando a preferência não está habilitada

File:

• trunk/expressoMail1_2/inc/class.imap_functions.inc.php (modified) (1 diff)

trunk/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -758 +758 @@
         function get_msg_sample($msg_number)
         {
-
+                $return = "";
+                if( (!isset($this->preferences['preview_msg_subject']) || ($this->preferences['preview_msg_subject'] != "1")) && 
+                    (!isset($this->preferences['preview_msg_tip']    ) || ($this->preferences['preview_msg_tip']     != "1")) )
+                {
+                        $return['body'] = "";
+                        return $return;
+                }
 
                 include_once("class.message_components.inc.php");
                 $msg = &new message_components($this->mbox);
-                $msg->fetch_structure($msg_number);
-                $return = "";
-
-                if( (isset($this->preferences['preview_msg_subject']) && ($this->preferences['preview_msg_subject'] == "0")) && (isset($this->preferences['preview_msg_tip']) && ($this->preferences['preview_msg_tip'] == "0")) )
-                {
-                        $return['body'] = "";
-                        return $return;
-                }
-
+                $msg->fetch_structure($msg_number);