The branch, master has been updated
via 2c0d2aca16ecab549900db7aa71a382e5404445d (commit)
from ced22c9c22cb9cb51b44e0a0c25f5f3ffb645423 (commit)
- Log -----------------------------------------------------------------
commit 2c0d2aca16ecab549900db7aa71a382e5404445d
Author: Piotr Przybylski <[email protected]>
Date: Tue Jul 12 18:14:26 2011 +0200
Use PMA_MYSQL_STR_VERSION instead of reconstructing it from
PMA_MYSQL_INT_VERSION
-----------------------------------------------------------------------
Summary of changes:
libraries/export/latex.php | 2 +-
libraries/export/sql.php | 2 +-
libraries/export/xml.php | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libraries/export/latex.php b/libraries/export/latex.php
index ee8f3a2..96be536 100644
--- a/libraries/export/latex.php
+++ b/libraries/export/latex.php
@@ -132,7 +132,7 @@ function PMA_exportHeader() {
}
$head .= $crlf
. '% ' . __('Generation Time') . ': ' . PMA_localisedDate() . $crlf
- . '% ' . __('Server version') . ': ' .
substr(PMA_MYSQL_INT_VERSION, 0, 1) . '.' . (int) substr(PMA_MYSQL_INT_VERSION,
1, 2) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 3) . $crlf
+ . '% ' . __('Server version') . ': ' . PMA_MYSQL_STR_VERSION .
$crlf
. '% ' . __('PHP Version') . ': ' . phpversion() . $crlf;
return PMA_exportOutputHandler($head);
}
diff --git a/libraries/export/sql.php b/libraries/export/sql.php
index e56d8a8..3230957 100644
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@@ -460,7 +460,7 @@ function PMA_exportHeader()
$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))
+ . PMA_exportComment(__('Server version') . ': ' .
PMA_MYSQL_STR_VERSION)
. PMA_exportComment(__('PHP Version') . ': ' . phpversion())
. PMA_possibleCRLF();
diff --git a/libraries/export/xml.php b/libraries/export/xml.php
index ec9fcfa..2665051 100644
--- a/libraries/export/xml.php
+++ b/libraries/export/xml.php
@@ -97,7 +97,7 @@ function PMA_exportHeader() {
}
$head .= $crlf
. '- ' . __('Generation Time') . ': ' . PMA_localisedDate() . $crlf
- . '- ' . __('Server version') . ': ' .
substr(PMA_MYSQL_INT_VERSION, 0, 1) . '.' . (int) substr(PMA_MYSQL_INT_VERSION,
1, 2) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 3) . $crlf
+ . '- ' . __('Server version') . ': ' . PMA_MYSQL_STR_VERSION .
$crlf
. '- ' . __('PHP Version') . ': ' . phpversion() . $crlf
. '-->' . $crlf . $crlf;
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
AppSumo Presents a FREE Video for the SourceForge Community by Eric
Ries, the creator of the Lean Startup Methodology on "Lean Startup
Secrets Revealed." This video shows you how to validate your ideas,
optimize your ideas and identify your business strategy.
http://p.sf.net/sfu/appsumosfdev2dev
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
