patch #1766633 Incorrect export with specified MySQL port, thanks to Juergen Wind

This commit is contained in:
Marc Delisle
2007-08-11 13:01:36 +00:00
parent 59c756e564
commit dc281ddf77
2 changed files with 6 additions and 7 deletions

View File

@@ -97,6 +97,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
. [export] Do not obey $cfg['MaxTableList'] on database export . [export] Do not obey $cfg['MaxTableList'] on database export
- [doc] UploadDir and the Import tab, thanks to Juergen Wind - [doc] UploadDir and the Import tab, thanks to Juergen Wind
- bug #1766975 Parameters lost when editing stored routine - 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) 2.10.3.0 (2007-07-20)

View File

@@ -195,13 +195,10 @@ function PMA_exportHeader()
$head = PMA_exportComment('phpMyAdmin SQL Dump') $head = PMA_exportComment('phpMyAdmin SQL Dump')
. PMA_exportComment('version ' . PMA_VERSION) . PMA_exportComment('version ' . PMA_VERSION)
. PMA_exportComment('http://www.phpmyadmin.net') . PMA_exportComment('http://www.phpmyadmin.net')
. PMA_exportComment() . PMA_exportComment();
. PMA_exportComment($GLOBALS['strHost'] . ': ' . $cfg['Server']['host']); $head .= empty($cfg['Server']['port']) ? PMA_exportComment($GLOBALS['strHost'] . ': ' . $cfg['Server']['host']) : PMA_exportComment($GLOBALS['strHost'] . ': ' . $cfg['Server']['host'] . ':' . $cfg['Server']['port']);
if (!empty($cfg['Server']['port'])) { $head .= PMA_exportComment($GLOBALS['strGenTime']
$head .= ':' . $cfg['Server']['port']; . ': ' . PMA_localisedDate())
}
$head .= $crlf
. 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['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()); . PMA_exportComment($GLOBALS['strPHPVersion'] . ': ' . phpversion());