diff --git a/ChangeLog b/ChangeLog index 7b75527d8..2657482ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -97,6 +97,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA . [export] Do not obey $cfg['MaxTableList'] on database export - [doc] UploadDir and the Import tab, thanks to Juergen Wind - bug #1766975 Parameters lost when editing stored routine +- [export] patch #1766633 Incorrect export with specified MySQL port, + thanks to Juergen Wind 2.10.3.0 (2007-07-20) diff --git a/libraries/export/sql.php b/libraries/export/sql.php index 237c07aa7..ecaaac56f 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -195,13 +195,10 @@ function PMA_exportHeader() $head = PMA_exportComment('phpMyAdmin SQL Dump') . PMA_exportComment('version ' . PMA_VERSION) . PMA_exportComment('http://www.phpmyadmin.net') - . PMA_exportComment() - . PMA_exportComment($GLOBALS['strHost'] . ': ' . $cfg['Server']['host']); - if (!empty($cfg['Server']['port'])) { - $head .= ':' . $cfg['Server']['port']; - } - $head .= $crlf - . PMA_exportComment($GLOBALS['strGenTime'] . ': ' . PMA_localisedDate()) + . PMA_exportComment(); + $head .= empty($cfg['Server']['port']) ? PMA_exportComment($GLOBALS['strHost'] . ': ' . $cfg['Server']['host']) : PMA_exportComment($GLOBALS['strHost'] . ': ' . $cfg['Server']['host'] . ':' . $cfg['Server']['port']); + $head .= PMA_exportComment($GLOBALS['strGenTime'] + . ': ' . PMA_localisedDate()) . PMA_exportComment($GLOBALS['strServerVersion'] . ': ' . substr(PMA_MYSQL_INT_VERSION, 0, 1) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 1, 2) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 3)) . PMA_exportComment($GLOBALS['strPHPVersion'] . ': ' . phpversion());