fix two bugs in MDB2, patches committed upstream https://pear.php.net/bugs/bug.php...

diff --git a/3rdparty/MDB2/Driver/Datatype/Common.php b/3rdparty/MDB2/Driver/Datatype/Common.php
index 3b02c86acdaeb9e0aaacd352a20b76bbb7df6541..dd7f1c7e0a9502987d8a37d7ac9ea8ad516a1c1e 100644 (file)
--- 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 3008bd04f0939a049ac1076db4cbc7641160311a..1d22e61f4603602dba11572ee950c53eb1567ea9 100644 (file)
--- 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