[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-1228-g20a402b

[Dieter Adriaenssens]

The branch, master has been updated
       via  20a402ba29776f2ed1ba3122e48df98bfc11cafe (commit)
       via  366d50a79b53c827926f97e14ee2f6937f161909 (commit)
      from  7a23444873b8a41fb379204236d27368a5427def (commit)


- Log -----------------------------------------------------------------
commit 20a402ba29776f2ed1ba3122e48df98bfc11cafe
Merge: 7a23444873b8a41fb379204236d27368a5427def 366d50a79b53c827926f97e14ee2f6937f161909
Author: Dieter Adriaenssens <ruleant at users.sourceforge.net>
Date:   Thu Apr 1 21:07:09 2010 +0200

    Merge branch 'QA_3_3'

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

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

diff --git a/ChangeLog b/ChangeLog
index c0655ba..1db24c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -75,6 +75,7 @@ $Id$
 - 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 ec6083a..a6d63bd 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