alecpl
2011-08-27 9a835c7f7ca3b2e1e021840254a15b0205388dfc
- Fix is_a() usage for PHP>5.3.6


3 files modified
11 ■■■■■ changed files
program/include/rcmail.php 7 ●●●● patch | view | raw | blame | history
program/include/rcube_plugin_api.php 2 ●●● patch | view | raw | blame | history
program/steps/mail/func.inc 2 ●●● patch | view | raw | blame | history
program/include/rcmail.php
@@ -393,7 +393,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]) {
@@ -1163,7 +1166,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();
    }
program/include/rcube_plugin_api.php
@@ -176,7 +176,7 @@
        if (is_subclass_of($plugin, 'rcube_plugin')) {
          // ... task, request type and framed mode
          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->init();
program/steps/mail/func.inc
@@ -1451,7 +1451,7 @@
{
  global $RCMAIL, $IMAP;
  if (!is_a($message, rcube_message))
  if (!is_object($message) || !is_a($message, rcube_message))
    $message = new rcube_message($message);
  if ($message->headers->mdn_to && !$message->headers->mdn_sent &&