diff options
| author | Valentin Sheyretski <valio@vsite.org> | 2015-07-15 15:25:32 +0300 |
|---|---|---|
| committer | Damien Regad <dregad@mantisbt.org> | 2015-08-11 14:56:49 +0200 |
| commit | 9ffa02e6ddc88dbfdfdf4437e0a398cc39960094 (patch) | |
| tree | 9d5cca8e0e3fe066a8e2253df14bd09718deaa83 /drivers/adodb-mysql.inc.php | |
| parent | ae85debec8c75c47b55566c3df08ec39002138df (diff) | |
| download | adodb-9ffa02e6ddc88dbfdfdf4437e0a398cc39960094.tar.gz adodb-9ffa02e6ddc88dbfdfdf4437e0a398cc39960094.tar.bz2 adodb-9ffa02e6ddc88dbfdfdf4437e0a398cc39960094.zip | |
Fix#139: Remove PHP 4 Constructors
This is the original commit from @valioz, rebased on latest master
Signed-off-by: Damien Regad <dregad@mantisbt.org>
Conflicts:
drivers/adodb-db2ora.inc.php
drivers/adodb-mssqlpo.inc.php
drivers/adodb-odbc_oracle.inc.php
Diffstat (limited to 'drivers/adodb-mysql.inc.php')
| -rw-r--r-- | drivers/adodb-mysql.inc.php | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/drivers/adodb-mysql.inc.php b/drivers/adodb-mysql.inc.php index b0a0c585..8e415b7f 100644 --- a/drivers/adodb-mysql.inc.php +++ b/drivers/adodb-mysql.inc.php @@ -45,7 +45,7 @@ class ADODB_mysql extends ADOConnection { var $nameQuote = '`'; /// string to use to quote identifiers and names var $compat323 = false; // true if compat with mysql 3.23 - function ADODB_mysql() + function __construct() { if (defined('ADODB_EXTENSION')) $this->rsPrefix .= 'ext_'; } @@ -708,7 +708,7 @@ class ADORecordSet_mysql extends ADORecordSet{ var $databaseType = "mysql"; var $canSeek = true; - function ADORecordSet_mysql($queryID,$mode=false) + function __construct($queryID,$mode=false) { if ($mode === false) { global $ADODB_FETCH_MODE; @@ -724,7 +724,7 @@ class ADORecordSet_mysql extends ADORecordSet{ $this->fetchMode = MYSQL_BOTH; break; } $this->adodbFetchMode = $mode; - $this->ADORecordSet($queryID); + parent::__construct($queryID); } function _initrs() @@ -870,23 +870,9 @@ class ADORecordSet_mysql extends ADORecordSet{ } class ADORecordSet_ext_mysql extends ADORecordSet_mysql { - function ADORecordSet_ext_mysql($queryID,$mode=false) + function __construct($queryID,$mode=false) { - if ($mode === false) { - global $ADODB_FETCH_MODE; - $mode = $ADODB_FETCH_MODE; - } - switch ($mode) - { - case ADODB_FETCH_NUM: $this->fetchMode = MYSQL_NUM; break; - case ADODB_FETCH_ASSOC:$this->fetchMode = MYSQL_ASSOC; break; - case ADODB_FETCH_DEFAULT: - case ADODB_FETCH_BOTH: - default: - $this->fetchMode = MYSQL_BOTH; break; - } - $this->adodbFetchMode = $mode; - $this->ADORecordSet($queryID); + parent::__construct($queryID,$mode); } function MoveNext() |