From 252d27459c05ff7fa38f2ac446eac9845f490c04 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 21 Mar 2012 08:53:50 -0400
Subject: [PATCH] - Fix E_STRICT warning (#1488404)
---
program/steps/mail/compose.inc | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 56abd24..9475f34 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -29,7 +29,6 @@
define('RCUBE_COMPOSE_EDIT', 0x0109);
$MESSAGE_FORM = null;
-$MESSAGE = null;
$COMPOSE_ID = get_input_value('_id', RCUBE_INPUT_GET);
$COMPOSE = null;
@@ -181,7 +180,7 @@
$MESSAGE = new rcube_message($msg_uid);
// 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');
if (!empty($MESSAGE->headers->charset))
@@ -240,6 +239,9 @@
if (!empty($COMPOSE['param']['attachment']))
$MESSAGE->forward_attachment = true;
}
+}
+else {
+ $MESSAGE = new stdClass();
}
$MESSAGE->compose = array();
@@ -1396,7 +1398,7 @@
$attrib['value'] = '1';
$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
$mdn_default = $RCMAIL->config->get('mdn_default');
--
Gitblit v1.9.1