diff options
| author | Jörn Friedrich Dreyer <jfd@butonic.de> | 2012-08-27 13:59:59 +0200 |
|---|---|---|
| committer | Jörn Friedrich Dreyer <jfd@butonic.de> | 2012-08-27 13:59:59 +0200 |
| commit | d91bd37bd7c576fcabab446d7c746727faaff5e1 (patch) | |
| tree | 3bb4cf8b4b447ecf76c1ac05fd23ba7f6b89e3b8 /3rdparty | |
| parent | f105e9b454abe8dedc241b90b62797851f767257 (diff) | |
| download | nextcloud-server-d91bd37bd7c576fcabab446d7c746727faaff5e1.tar.gz nextcloud-server-d91bd37bd7c576fcabab446d7c746727faaff5e1.zip | |
fix two bugs in MDB2, patches committed upstream https://pear.php.net/bugs/bug.php?id=19582
Diffstat (limited to '3rdparty')
| -rw-r--r-- | 3rdparty/MDB2/Driver/Datatype/Common.php | 2 | ||||
| -rw-r--r-- | 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 3b02c86acda..dd7f1c7e0a9 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 3008bd04f09..1d22e61f460 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 |