Skip to content
Permalink
Browse files

Merge branch 'allow_local_infile' into QA_4_8

  • Loading branch information
nijel committed Jan 21, 2019
2 parents c5e01f8 + aeac906 commit 828f740158e7bf14aa4a7473c5968d06364e03a2
Showing with 5 additions and 0 deletions.
  1. +5 −0 libraries/classes/Dbi/DbiMysql.php
@@ -8,6 +8,7 @@
*/
namespace PhpMyAdmin\Dbi;

use PhpMyAdmin\Core;
use PhpMyAdmin\DatabaseInterface;

if (! defined('PHPMYADMIN')) {
@@ -45,6 +46,10 @@ private function _realConnect($server, $user, $password, $client_flags,
) {
global $cfg;

if (ini_get('mysql.allow_local_infile')) {
Core::fatalError(__('Please disable mysql.allow_local_infile in your PHP configuration or install the mysqli extension.'));
}

if (empty($client_flags)) {
if ($cfg['PersistentConnections'] || $persistent) {
$link = @mysql_pconnect($server, $user, $password);

0 comments on commit 828f740

Please sign in to comment.
You can’t perform that action at this time.