From 8c124b9ea8ae5a1793c61ccb4c4e5c0dd0f77787 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 16 Sep 2011 04:06:09 -0400
Subject: [PATCH] - Fix is_a() usage
---
program/steps/mail/func.inc | 2 +-
program/lib/PEAR.php | 2 +-
program/lib/MDB2/Driver/Datatype/Common.php | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/program/lib/MDB2/Driver/Datatype/Common.php b/program/lib/MDB2/Driver/Datatype/Common.php
index 2a815cb..2083d75 100644
--- a/program/lib/MDB2/Driver/Datatype/Common.php
+++ b/program/lib/MDB2/Driver/Datatype/Common.php
@@ -1379,7 +1379,7 @@
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 @@
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 @@
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/program/lib/PEAR.php b/program/lib/PEAR.php
index a792d9f..8cc7152 100644
--- a/program/lib/PEAR.php
+++ b/program/lib/PEAR.php
@@ -265,7 +265,7 @@
*/
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/program/steps/mail/func.inc b/program/steps/mail/func.inc
index ab4b290..98040e9 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1451,7 +1451,7 @@
{
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 &&
--
Gitblit v1.9.1