summaryrefslogtreecommitdiff
path: root/program/include/rcube_message.php
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-06-08 12:46:05 +0000
committeralecpl <alec@alec.pl>2010-06-08 12:46:05 +0000
commit64e3e80743415e5fb121eb5c66416593c38ef288 (patch)
treefdf160e8eb9580deab6c4fc2cbdb3ceb63d3c76f /program/include/rcube_message.php
parentb93d00026aefbdccfabd6253f9cb184956617084 (diff)
- Fix some IMAP errors handling when opening the message (#1485443)
Diffstat (limited to 'program/include/rcube_message.php')
-rw-r--r--program/include/rcube_message.php9
1 files changed, 6 insertions, 3 deletions
diff --git a/program/include/rcube_message.php b/program/include/rcube_message.php
index 35a8f4a88..e51ab26e0 100644
--- a/program/include/rcube_message.php
+++ b/program/include/rcube_message.php
@@ -5,7 +5,7 @@
| program/include/rcube_message.php |
| |
| This file is part of the RoundCube Webmail client |
- | Copyright (C) 2008-2009, RoundCube Dev. - Switzerland |
+ | Copyright (C) 2008-2010, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -63,14 +63,17 @@ class rcube_message
{
$this->app = rcmail::get_instance();
$this->imap = $this->app->imap;
-
+
$this->uid = $uid;
$this->headers = $this->imap->get_headers($uid, NULL, true, true);
+ if (!$this->headers)
+ return;
+
$this->subject = rcube_imap::decode_mime_string(
$this->headers->subject, $this->headers->charset);
list(, $this->sender) = each($this->imap->decode_address_list($this->headers->from));
-
+
$this->set_safe((intval($_GET['_safe']) || $_SESSION['safe_messages'][$uid]));
$this->opt = array(
'safe' => $this->is_safe,