From d91bd37bd7c576fcabab446d7c746727faaff5e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Mon, 27 Aug 2012 13:59:59 +0200
Subject: [PATCH] fix two bugs in MDB2, patches committed upstream
https://pear.php.net/bugs/bug.php?id=19582
---
3rdparty/MDB2/Driver/Datatype/Common.php | 2 +-
3rdparty/MDB2/Driver/mysql.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/3rdparty/MDB2/Driver/Datatype/Common.php b/3rdparty/MDB2/Driver/Datatype/Common.php
index 3b02c86acd..dd7f1c7e0a 100644
--- a/3rdparty/MDB2/Driver/Datatype/Common.php
+++ b/3rdparty/MDB2/Driver/Datatype/Common.php
@@ -1412,7 +1412,7 @@ class MDB2_Driver_Datatype_Common extends MDB2_Module_Common
if (PEAR::isError($db)) {
return $db;
}
- if (isset($db->function) && is_object($this->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';
diff --git a/3rdparty/MDB2/Driver/mysql.php b/3rdparty/MDB2/Driver/mysql.php
index 3008bd04f0..1d22e61f46 100644
--- a/3rdparty/MDB2/Driver/mysql.php
+++ b/3rdparty/MDB2/Driver/mysql.php
@@ -80,7 +80,7 @@ class MDB2_Driver_mysql extends MDB2_Driver_Common
protected $start_transaction = false;
- protected $varchar_max_length = 255;
+ public $varchar_max_length = 255;
// }}}
// {{{ constructor
--
GitLab