diff options
| author | Damien Regad <dregad@mantisbt.org> | 2016-12-21 18:21:49 +0100 |
|---|---|---|
| committer | Damien Regad <dregad@mantisbt.org> | 2016-12-21 18:21:49 +0100 |
| commit | 0b4fdaddad3ce8c34ea1b8c9caec9cc74ebcc585 (patch) | |
| tree | 58b49f7d9de27a993e730f852304fa0eeccb99b7 | |
| parent | 09df93e79ed754b40fd415d07ee53650fa35fd73 (diff) | |
| parent | 99ac061ae91ca8039050bcf2d3b7f75c8010c914 (diff) | |
| download | adodb-0b4fdaddad3ce8c34ea1b8c9caec9cc74ebcc585.tar.gz adodb-0b4fdaddad3ce8c34ea1b8c9caec9cc74ebcc585.tar.bz2 adodb-0b4fdaddad3ce8c34ea1b8c9caec9cc74ebcc585.zip | |
Merge branch 'hotfix/5.20.9'
Conflicts:
docs/changelog.md
| -rw-r--r-- | docs/changelog.md | 4 | ||||
| -rw-r--r-- | drivers/adodb-mssqlnative.inc.php | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/docs/changelog.md b/docs/changelog.md index daf99750..6241852c 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -49,6 +49,10 @@ Older changelogs: - session: add 'httponly' flag to cookie. #190 - xml: support table 'opt' attribute with mysqli. #267 +## 5.20.9 - 21-Dec-2016 + +- mssql: fix syntax error in version matching regex #305 + ## 5.20.8 - 17-Dec-2016 - mssql: support MSSQL Server 2016 and later #294 diff --git a/drivers/adodb-mssqlnative.inc.php b/drivers/adodb-mssqlnative.inc.php index e8396001..724ce2e3 100644 --- a/drivers/adodb-mssqlnative.inc.php +++ b/drivers/adodb-mssqlnative.inc.php @@ -153,7 +153,7 @@ class ADODB_mssqlnative extends ADOConnection { */ function ServerVersion() { $data = $this->ServerInfo(); - preg_match('/^\d{2}', $data['version'], $matches); + preg_match('/^\d{2}/', $data['version'], $matches); $version = (int)reset($matches); // We only support SQL Server 2005 and up |