gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #15257 from Tithugues/feature/useless-i-modifier

Browse Source 
Remove useless "i" modifier on non-character selection
This commit is contained in:
Maurício Meneghini Fauth 2019-05-08 14:19:00 -03:00 committed by GitHub
commit ad2c698650
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/classes/Server/Privileges.php
View File

@ -3097,7 +3097,7 @@ class Privileges
) {
if (isset($GLOBALS['dbname'])) {
//if (preg_match('/\\\\(?:_|%)/i', $dbname)) {
if (preg_match('/(?<!\\\\)(?:_|%)/i', $GLOBALS['dbname'])) {
if (preg_match('/(?<!\\\\)(?:_|%)/', $GLOBALS['dbname'])) {
$dbname_is_wildcard = true;
} else {
$dbname_is_wildcard = false;
@ -4592,7 +4592,7 @@ class Privileges
// check if given $dbname is a wildcard or not
if (isset($dbname)) {
//if (preg_match('/\\\\(?:_|%)/i', $dbname)) {
if (! is_array($dbname) && preg_match('/(?<!\\\\)(?:_|%)/i', $dbname)) {
if (! is_array($dbname) && preg_match('/(?<!\\\\)(?:_|%)/', $dbname)) {
$dbname_is_wildcard = true;
} else {
$dbname_is_wildcard = false;