Skip to content

Fix Joomla CMS PR #26104#43

Merged
zero-24 merged 1 commit intozero-24:400minimumupdatefrom
richard67:400minimumupdate
Sep 4, 2019
Merged

Fix Joomla CMS PR #26104#43
zero-24 merged 1 commit intozero-24:400minimumupdatefrom
richard67:400minimumupdate

Conversation

@richard67
Copy link

@richard67 richard67 commented Sep 4, 2019

Pull Request for joomla#26104.

Summary of Changes

The regex to check for MariaDB is good for extracting the version number when having a MariaDB, but it is not good for checking if the DB is a MariaDB or not, because the "(mariadb-)?" part of the regex may appear zero ore one time.

It is safer to check if the version string contains mariadb (case insensitive), becaue it may appear at the beginning or at the end. The regex des not cover this.

This PR here changes it so it works the same way as in the db driver from framework 2.0-dev branch, and there it was implemented by me.

Testing Instructions

Paste the regex into an online tool and check if it matches also to a MySQL version string.

Expected result

Should not match.

Actual result

Matches.

Documentation Changes Required

None.

@zero-24 zero-24 merged commit b77cb35 into zero-24:400minimumupdate Sep 4, 2019
@richard67 richard67 deleted the 400minimumupdate branch September 4, 2019 19:47
@zero-24
Copy link
Owner

zero-24 commented Sep 4, 2019

Merging thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants