From d9daaac0849808d71f20faed21df4b51a3df0186 Mon Sep 17 00:00:00 2001 From: alec Date: Tue, 8 Jun 2010 12:46:05 +0000 Subject: - Fix some IMAP errors handling when opening the message (#1485443) git-svn-id: https://svn.roundcube.net/trunk@3726 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/include/rcube_message.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'roundcubemail/program/include/rcube_message.php') diff --git a/roundcubemail/program/include/rcube_message.php b/roundcubemail/program/include/rcube_message.php index 35a8f4a88..e51ab26e0 100644 --- a/roundcubemail/program/include/rcube_message.php +++ b/roundcubemail/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, -- cgit v1.2.3