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

Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2

Browse Source
This commit is contained in:
Weblate 2014-07-30 14:34:06 +02:00
commit 82187c0224
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog
- bug #4427 Action icons not in horizontal order
- bug #4493 s_attention.png is missing
- bug #4499 Uncaught TypeError: Cannot call method 'substr' of undefined
- bug #4498 PMA 4.2.x and HHVM
4.2.6.0 (2014-07-17)
- bug #4471 Undefined index warning with referenced column.

4
libraries/dbi/DBIMysqli.class.php
View File

@ -135,7 +135,7 @@ class PMA_DBI_Mysqli implements PMA_DBI_Extension
if ($server) {
$server_port = (empty($server['port']))
? false
? null
: (int)$server['port'];
$server_socket = (empty($server['socket']))
? ''
@ -145,7 +145,7 @@ class PMA_DBI_Mysqli implements PMA_DBI_Extension
: $server['host'];
} else {
$server_port = (empty($cfg['Server']['port']))
? false
? null
: (int) $cfg['Server']['port'];
$server_socket = (empty($cfg['Server']['socket']))
? null