diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-09-16 08:06:09 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-09-16 08:06:09 +0000 |
| commit | 274cb6a59213b35dc17b4329482f0a8088a1970e (patch) | |
| tree | ee49d84cd76ff324d0cc862998c61c1f74bf9f7a /roundcubemail/program | |
| parent | 47653234b431c87d721eb7a20b65803dfb033066 (diff) | |
- Fix is_a() usage
git-svn-id: https://svn.roundcube.net/trunk@5222 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program')
| -rw-r--r-- | roundcubemail/program/lib/MDB2/Driver/Datatype/Common.php | 6 | ||||
| -rw-r--r-- | roundcubemail/program/lib/PEAR.php | 2 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/roundcubemail/program/lib/MDB2/Driver/Datatype/Common.php b/roundcubemail/program/lib/MDB2/Driver/Datatype/Common.php index 2a815cbef..2083d7577 100644 --- a/roundcubemail/program/lib/MDB2/Driver/Datatype/Common.php +++ b/roundcubemail/program/lib/MDB2/Driver/Datatype/Common.php @@ -1379,7 +1379,7 @@ class MDB2_Driver_Datatype_Common extends MDB2_Module_Common if (PEAR::isError($db)) { 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'); } return 'CURRENT_DATE'; @@ -1408,7 +1408,7 @@ class MDB2_Driver_Datatype_Common extends MDB2_Module_Common if (PEAR::isError($db)) { 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'); } return 'CURRENT_TIMESTAMP'; @@ -1437,7 +1437,7 @@ class MDB2_Driver_Datatype_Common extends MDB2_Module_Common if (PEAR::isError($db)) { 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'); } return 'CURRENT_TIME'; diff --git a/roundcubemail/program/lib/PEAR.php b/roundcubemail/program/lib/PEAR.php index a792d9f57..8cc715204 100644 --- a/roundcubemail/program/lib/PEAR.php +++ b/roundcubemail/program/lib/PEAR.php @@ -265,7 +265,7 @@ class PEAR */ function isError($data, $code = null) { - if (!is_a($data, 'PEAR_Error')) { + if (!is_object($data) || !is_a($data, 'PEAR_Error')) { return false; } diff --git a/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index ab4b2907a..98040e99f 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/program/steps/mail/func.inc @@ -1451,7 +1451,7 @@ function rcmail_send_mdn($message, &$smtp_error) { 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); if ($message->headers->mdn_to && !$message->headers->mdnsent && |