From b578abb9f94fa1d7dc8ce2ee94e35fa074d51ce4 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 19 Sep 2011 02:43:57 -0400
Subject: [PATCH] - Applied fixes from trunk up to r5232
---
program/lib/MDB2/Driver/Datatype/Common.php | 6 +++---
1 files changed, 3 insertions(+), 3 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';
--
Gitblit v1.9.1