summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-09-15 13:36:17 +0000
committeralecpl <alec@alec.pl>2010-09-15 13:36:17 +0000
commit457373bf3ff3c875a8626824c2068aed7a4c989e (patch)
tree00a9551aa7457b7ed12a7b68a754b57fa389ece9 /program/include
parentacbf0f5ee09ec7832c2747d98c94091c6dcd0a8a (diff)
- Fix: close() method of addressbook object(s) is not called in shutdown function
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcmail.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 0a7c15d84..e91111975 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -45,6 +45,7 @@ class rcmail
public $comm_path = './';
private $texts;
+ private $books = array();
/**
@@ -280,6 +281,10 @@ class rcmail
$contacts = new rcube_contacts($this->db, $this->user->ID);
}
+ // add to the 'books' array for shutdown function
+ if (!in_array($contacts, $this->books))
+ $this->books[] = $contacts;
+
return $contacts;
}
@@ -974,8 +979,9 @@ class rcmail
if (is_object($this->smtp))
$this->smtp->disconnect();
- if (is_object($this->contacts))
- $this->contacts->close();
+ foreach ($this->books as $book)
+ if (is_object($book))
+ $book->close();
// before closing the database connection, write session data
if ($_SERVER['REMOTE_ADDR'])