The branch, master has been updated via d14e49f8271c25b11cdc98962e6b24338aaef90e (commit) from 3cf4830bbb94ce8fe7078f4a3f4fbac1c6253a8c (commit)

- Log ----------------------------------------------------------------- commit d14e49f8271c25b11cdc98962e6b24338aaef90e Author: Michal Čihař mcihar@novell.com Date: Mon Jun 6 13:47:00 2011 +0200

Simplify code

-----------------------------------------------------------------------

Summary of changes: libraries/export/sql.php | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/libraries/export/sql.php b/libraries/export/sql.php index 55d330e..432aa78 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -449,7 +449,11 @@ function PMA_exportHeader() . PMA_exportComment('version ' . PMA_VERSION) . PMA_exportComment('http://www.phpmyadmin.net') . PMA_exportComment(); - $head .= empty($cfg['Server']['port']) ? PMA_exportComment(__('Host') . ': ' . $cfg['Server']['host']) : PMA_exportComment(__('Host') . ': ' . $cfg['Server']['host'] . ':' . $cfg['Server']['port']); + $host_string = __('Host') . ': ' . $cfg['Server']['host']; + if (!empty($cfg['Server']['port'])) { + $host_string .= ':' . $cfg['Server']['port']; + } + $head .= PMA_exportComment($host_string); $head .= PMA_exportComment(__('Generation Time') . ': ' . PMA_localisedDate()) . PMA_exportComment(__('Server version') . ': ' . substr(PMA_MYSQL_INT_VERSION, 0, 1) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 1, 2) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 3))

hooks/post-receive