From b08caf5813c43e8648cdf5db1e003b3046a37c2c Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 31 Aug 2011 08:49:44 -0400
Subject: [PATCH] - Applied fixes from trunk up to r5150
---
program/include/rcmail.php | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 1e13624..03b536b 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -413,7 +413,10 @@
$id = '0';
// use existing instance
- if (isset($this->address_books[$id]) && is_a($this->address_books[$id], 'rcube_addressbook') && (!$writeable || !$this->address_books[$id]->readonly)) {
+ if (isset($this->address_books[$id]) && is_object($this->address_books[$id])
+ && is_a($this->address_books[$id], 'rcube_addressbook')
+ && (!$writeable || !$this->address_books[$id]->readonly)
+ ) {
$contacts = $this->address_books[$id];
}
else if ($id && $ldap_config[$id]) {
@@ -1183,7 +1186,7 @@
$this->smtp->disconnect();
foreach ($this->address_books as $book) {
- if (is_a($book, 'rcube_addressbook'))
+ if (is_object($book) && is_a($book, 'rcube_addressbook'))
$book->close();
}
--
Gitblit v1.9.1