diff options
Diffstat (limited to 'program/lib')
| -rw-r--r-- | program/lib/MDB2/Driver/Datatype/Common.php | 6 | ||||
| -rw-r--r-- | program/lib/PEAR.php | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/program/lib/MDB2/Driver/Datatype/Common.php b/program/lib/MDB2/Driver/Datatype/Common.php index 2a815cbef..2083d7577 100644 --- a/program/lib/MDB2/Driver/Datatype/Common.php +++ b/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/program/lib/PEAR.php b/program/lib/PEAR.php index a792d9f57..8cc715204 100644 --- a/program/lib/PEAR.php +++ b/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; } |