Changeset 6028 in subversion

Timestamp:

Mar 21, 2012 8:53:50 AM (15 months ago)

Author:

alec

Message:

• Fix E_STRICT warning (#1488404)

File:

• trunk/roundcubemail/program/steps/mail/compose.inc (modified) (4 diffs)

trunk/roundcubemail/program/steps/mail/compose.inc

@@ -30 +30 @@
 
 $MESSAGE_FORM = null;
-$MESSAGE      = null;
 $COMPOSE_ID   = get_input_value('_id', RCUBE_INPUT_GET);
 $COMPOSE      = null;
@@ -182 +181 @@
 
   // make sure message is marked as read
-  if ($MESSAGE && $MESSAGE->headers && empty($MESSAGE->headers->flags['SEEN']))
+  if ($MESSAGE->headers && empty($MESSAGE->headers->flags['SEEN']))
     $RCMAIL->storage->set_flag($msg_uid, 'SEEN');
 
@@ -241 +240 @@
       $MESSAGE->forward_attachment = true;
   }
+}
+else {
+  $MESSAGE = new stdClass();
 }
 
@@ -1397 +1399 @@
   $checkbox = new html_checkbox($attrib);
 
-  if ($MESSAGE && in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT)))
+  if (in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT)))
     $mdn_default = (bool) $MESSAGE->headers->mdn_to;
   else