- Fix is_a() usage for PHP>5.3.6

release-0.7
alecpl 13 years ago
parent 20ed3794f6
commit 9a835c7f7c

@ -393,7 +393,10 @@ class rcmail
$id = '0'; $id = '0';
// use existing instance // 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]; $contacts = $this->address_books[$id];
} }
else if ($id && $ldap_config[$id]) { else if ($id && $ldap_config[$id]) {
@ -1163,7 +1166,7 @@ class rcmail
$this->smtp->disconnect(); $this->smtp->disconnect();
foreach ($this->address_books as $book) { foreach ($this->address_books as $book) {
if (is_a($book, 'rcube_addressbook')) if (is_object($book) && is_a($book, 'rcube_addressbook'))
$book->close(); $book->close();
} }

@ -176,7 +176,7 @@ class rcube_plugin_api
if (is_subclass_of($plugin, 'rcube_plugin')) { if (is_subclass_of($plugin, 'rcube_plugin')) {
// ... task, request type and framed mode // ... task, request type and framed mode
if ((!$plugin->task || preg_match('/^('.$plugin->task.')$/i', $rcmail->task)) if ((!$plugin->task || preg_match('/^('.$plugin->task.')$/i', $rcmail->task))
&& (!$plugin->noajax || is_a($rcmail->output, 'rcube_template')) && (!$plugin->noajax || (is_object($rcmail->output) && is_a($rcmail->output, 'rcube_template')))
&& (!$plugin->noframe || empty($_REQUEST['_framed'])) && (!$plugin->noframe || empty($_REQUEST['_framed']))
) { ) {
$plugin->init(); $plugin->init();

@ -1451,7 +1451,7 @@ function rcmail_send_mdn($message, &$smtp_error)
{ {
global $RCMAIL, $IMAP; global $RCMAIL, $IMAP;
if (!is_a($message, rcube_message)) if (!is_object($message) || !is_a($message, rcube_message))
$message = new rcube_message($message); $message = new rcube_message($message);
if ($message->headers->mdn_to && !$message->headers->mdn_sent && if ($message->headers->mdn_to && !$message->headers->mdn_sent &&

Loading…
Cancel
Save