[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-87-g366d50a

[Dieter Adriaenssens]

The branch, QA_3_3 has been updated
       via  366d50a79b53c827926f97e14ee2f6937f161909 (commit)
      from  acb30d5a2ae4d4235f95fe1087065c5562ae194f (commit)


- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |    1 +
 server_status.php |    4 ++++
 2 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 61e090d..c02f8c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - patch #2979234 [import] Create tables with current charset and collation.
 - patch #2979234, bug #2960105 [import] Properly import unicode text from ODS.
 - bug #2973280 [export] Proper handling of temporary directory in XLS export.
+- bug #2980582 [interface] Properly format server status parameter.
 
 3.3.1.0 (2010-03-16)
 - bug #2941037 [core] Database structure not sorted by table correctly 
diff --git a/server_status.php b/server_status.php
index 64048b3..9c8fe01 100644
--- a/server_status.php
+++ b/server_status.php
@@ -143,6 +143,10 @@ if (isset($server_status['Threads_created'])
       * 100;
 }
 
+// Format Uptime_since_flush_status : show as days, hours, minutes, seconds
+if (isset($server_status['Uptime_since_flush_status'])) {
+    $server_status['Uptime_since_flush_status'] = PMA_timespanFormat($server_status['Uptime_since_flush_status']);
+}
 
 /**
  * define some alerts


hooks/post-receive
-- 
phpMyAdmin