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

* lib.inc.php3: fixed the socket patch, should work now

Browse Source
This commit is contained in:
Olivier Müller
2001-08-21 07:32:44 +00:00
parent 3fc8fa4a45
commit 51034ae5f5
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
lib.inc.php3
View File

@@ -266,9 +266,10 @@ if (!defined('__LIB_INC__')){
$server_port = (empty($cfgServer['port']))
? ''
: ':' . $cfgServer['port'];
$server_socket = (empty($cfgServer['socket']) || PMA_INT_VERSION < 30010)
$server_socket = (empty($cfgServer['socket']) || PMA_INT_VERSION >= 30010)
? ''
: ':' . $cfgServer['socket'];
$dbh = @$connect_func(
$cfgServer['host'] . $server_port . $server_socket,
$cfgServer['stduser'],
@@ -359,11 +360,20 @@ if (!defined('__LIB_INC__')){
} // end Advanced authentication
// Do connect to the user's database
if (empty($cfgServer['port'])) {
$link = $connect_func($cfgServer['host'], $cfgServer['user'], $cfgServer['password']) or mysql_die();
} else {
$link = $connect_func($cfgServer['host'] . ':' . $cfgServer['port'], $cfgServer['user'], $cfgServer['password']) or mysql_die();
}
$server_port = (empty($cfgServer['port']))
? ''
: ':' . $cfgServer['port'];
$server_socket = (empty($cfgServer['socket']) || PMA_INT_VERSION >= 30010)
? ''
: ':' . $cfgServer['socket'];
$dbh = $connect_func(
$cfgServer['host'] . $server_port . $server_socket,
$cfgServer['user'],
$cfgServer['password']
) or mysql_die();
} // end server connecting
/**