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

Merge pull request #14886 from vrana/master

Browse Source 
Actually set MYSQLI_OPT_LOCAL_INFILE
This commit is contained in:
Michal Čihař 2019-01-21 19:29:55 +01:00 committed by GitHub
commit 98506151d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/classes/Dbi/DbiMysqli.php
View File

@ -58,12 +58,6 @@ class DbiMysqli implements DbiExtension
$mysqli = \mysqli_init();
if (defined('PMA_ENABLE_LDI')) {
$mysqli->options(MYSQLI_OPT_LOCAL_INFILE, true);
} else {
$mysqli->options(MYSQLI_OPT_LOCAL_INFILE, false);
}
$client_flags = 0;
/* Optionally compress connection */
@ -142,6 +136,12 @@ class DbiMysqli implements DbiExtension
return false;
}
if (defined('PMA_ENABLE_LDI')) {
$mysqli->options(MYSQLI_OPT_LOCAL_INFILE, true);
} else {
$mysqli->options(MYSQLI_OPT_LOCAL_INFILE, false);
}
return $mysqli;
}