Changeset 5222 in subversion

Timestamp:

Sep 16, 2011 4:06:09 AM (21 months ago)

Author:

alec

Message:

• Fix is_a() usage

Location:

trunk/roundcubemail/program

Files:

• lib/MDB2/Driver/Datatype/Common.php (modified) (3 diffs)
• lib/PEAR.php (modified) (1 diff)
• steps/mail/func.inc (modified) (1 diff)

trunk/roundcubemail/program/lib/MDB2/Driver/Datatype/Common.php

@@ -1380 +1380 @@
                 return $db;
             }
-            if (isset($db->function) && is_a($db->function, 'MDB2_Driver_Function_Common')) {
+            if (isset($db->function) && is_object($db->function) && is_a($db->function, 'MDB2_Driver_Function_Common')) {
                 return $db->function->now('date');
             }
@@ -1409 +1409 @@
                 return $db;
             }
-            if (isset($db->function) && is_a($db->function, 'MDB2_Driver_Function_Common')) {
+            if (isset($db->function) && is_object($db->function) && is_a($db->function, 'MDB2_Driver_Function_Common')) {
                 return $db->function->now('timestamp');
             }
@@ -1438 +1438 @@
                 return $db;
             }
-            if (isset($db->function) && is_a($db->function, 'MDB2_Driver_Function_Common')) {
+            if (isset($db->function) && is_object($db->function) && is_a($db->function, 'MDB2_Driver_Function_Common')) {
                 return $db->function->now('time');
             }

trunk/roundcubemail/program/lib/PEAR.php

@@ -266 +266 @@
     function isError($data, $code = null)
     {
-        if (!is_a($data, 'PEAR_Error')) {
+        if (!is_object($data) || !is_a($data, 'PEAR_Error')) {
             return false;
         }

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

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