Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2ae8b9248e49d0ed55ea86df3ae53ef5559258ee https://github.com/phpmyadmin/phpmyadmin/commit/2ae8b9248e49d0ed55ea86df3ae5... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-03 (Fri, 03 Jun 2016) Changed paths: M libraries/DatabaseInterface.php M libraries/dbi/DBIMysql.php M libraries/dbi/DBIMysqli.php Log Message: ----------- Simplify server port handling The intval function does return 0 for empty string, so we really do not have to special case here. Issue #12279 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: f3925a8b7c3d5c035e330f0b13bf568e04108941 https://github.com/phpmyadmin/phpmyadmin/commit/f3925a8b7c3d5c035e330f0b13bf... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-03 (Fri, 03 Jun 2016) Changed paths: M libraries/DatabaseInterface.php M libraries/dbi/DBIMysql.php M libraries/dbi/DBIMysqli.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8a494f26d2ff...f3925a8b7c3d