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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2014-07-25 07:21:49 +02:00
commit 6533ae7377
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/DatabaseInterface.class.php
View File

@ -2300,7 +2300,7 @@ class PMA_DatabaseInterface
*
* @param array|null $server host/port/socket/persistent
*
* @return false|integer
* @return null|integer
*/
public function getServerPort($server = null)
{
@ -2309,7 +2309,7 @@ class PMA_DatabaseInterface
}
if (empty($server['port'])) {
return false;
return null;
} else {
return intval($server['port']);
}

2
libraries/dbi/DBIMysql.class.php
View File

@ -99,7 +99,7 @@ class PMA_DBI_Mysql implements PMA_DBI_Extension
$server_port = $GLOBALS['dbi']->getServerPort($server);
$server_socket = $GLOBALS['dbi']->getServerSocket($server);
if ($server_port === false) {
if ($server_port === null) {
$server_port = '';
} else {
$server_port = ':' . $server_port;