Changeset 5138 in subversion

Timestamp:

Aug 27, 2011 4:33:35 AM (21 months ago)

Author:

alec

Message:

• Fix is_a() usage for PHP>5.3.6

Location:

trunk/roundcubemail/program

Files:

• include/rcmail.php (modified) (2 diffs)
• include/rcube_plugin_api.php (modified) (1 diff)
• steps/mail/func.inc (modified) (1 diff)

trunk/roundcubemail/program/include/rcmail.php

@@ -394 +394 @@
 
     // 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];
     }
@@ -1164 +1167 @@
 
     foreach ($this->address_books as $book) {
-      if (is_a($book, 'rcube_addressbook'))
+      if (is_object($book) && is_a($book, 'rcube_addressbook'))
         $book->close();
     }

trunk/roundcubemail/program/include/rcube_plugin_api.php

@@ -177 +177 @@
           // ... 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']))
           ) {

trunk/roundcubemail/program/steps/mail/func.inc

@@ -1452 +1452 @@
   global $RCMAIL, $IMAP;
 
-  if (!is_a($message, rcube_message))
+  if (!is_object($message) || !is_a($message, rcube_message))
     $message = new rcube_message($message);