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

Merge pull request #15373 from Tithugues/fix/import-instead-of-using-fqn

Browse Source 
Import instead of using FQN
This commit is contained in:
Maurício Meneghini Fauth 2019-07-06 18:17:01 -03:00 committed by GitHub
commit 39c85e51ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/classes/Config/Validator.php
View File

@ -13,6 +13,10 @@ use PhpMyAdmin\Config\ConfigFile;
use PhpMyAdmin\Core;
use PhpMyAdmin\DatabaseInterface;
use PhpMyAdmin\Util;
use function mysql_close;
use function mysql_connect;
use function mysqli_close;
use function mysqli_connect;
/**
* Validation class for various validation functions
@ -212,18 +216,18 @@ class Validator
}
if ($extension == 'mysql') {
$conn = @\mysql_connect($host . $port . $socket, $user, $pass);
$conn = @mysql_connect($host . $port . $socket, $user, $pass);
if (! $conn) {
$error = __('Could not connect to the database server!');
} else {
\mysql_close($conn);
mysql_close($conn);
}
} else {
$conn = @\mysqli_connect($host, $user, $pass, null, $port, $socket);
$conn = @mysqli_connect($host, $user, $pass, null, $port, $socket);
if (! $conn) {
$error = __('Could not connect to the database server!');
} else {
\mysqli_close($conn);
mysqli_close($conn);
}
}
if ($error !== null) {

5
libraries/classes/Database/Designer/Common.php
View File

@ -14,6 +14,7 @@ use PhpMyAdmin\Index;
use PhpMyAdmin\Relation;
use PhpMyAdmin\Table;
use PhpMyAdmin\Util;
use function rawurlencode;
/**
* Common functions for Designer
@ -273,8 +274,8 @@ class Common
if (Util::isForeignKeySupported($GLOBALS['designer']['TABLE_TYPE'][$i])) {
$j = 1;
}
$retval['j_tabs'][\rawurlencode($GLOBALS['designer_url']['TABLE_NAME'][$i])] = $j;
$retval['h_tabs'][\rawurlencode($GLOBALS['designer_url']['TABLE_NAME'][$i])] = 1;
$retval['j_tabs'][rawurlencode($GLOBALS['designer_url']['TABLE_NAME'][$i])] = $j;
$retval['h_tabs'][rawurlencode($GLOBALS['designer_url']['TABLE_NAME'][$i])] = 1;
}
return $retval;
}

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

@ -14,6 +14,7 @@ use mysqli;
use mysqli_result;
use PhpMyAdmin\DatabaseInterface;
use stdClass;
use function mysqli_init;
/**
* Interface to the MySQL Improved extension (MySQLi)
@ -59,7 +60,7 @@ class DbiMysqli implements DbiExtension
: $server['host'];
}
$mysqli = \mysqli_init();
$mysqli = mysqli_init();
$client_flags = 0;

2
libraries/classes/Plugins/Import/AbstractImportCsv.php
View File

@ -29,7 +29,7 @@ abstract class AbstractImportCsv extends ImportPlugin
* Sets the import plugin properties.
* Called in the constructor.
*
* @return \PhpMyAdmin\Properties\Options\Groups\OptionsPropertyMainGroup|void object of the plugin
* @return OptionsPropertyMainGroup|void object of the plugin
*/
protected function setProperties()
{