[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1471-g39bc66d

[Michal Čihař]

The branch, master has been updated
       via  39bc66df25b98aa61caba73b36003fe763346703 (commit)
       via  311fd3b7cb626f1e4be97e2865d4a4da82a579ce (commit)
      from  d50215684a9b5b0cab7d8404f489a721f92d93f4 (commit)


- Log -----------------------------------------------------------------
commit 39bc66df25b98aa61caba73b36003fe763346703
Author: Michal Čihař <mcihar at novell.com>
Date:   Fri Jan 28 09:55:20 2011 +0100

    rfe #1954161 [interface] Do not display long numbers in server status.
    
    Fixed again, hopefully this way will work better.

commit 311fd3b7cb626f1e4be97e2865d4a4da82a579ce
Author: Michal Čihař <mcihar at novell.com>
Date:   Fri Jan 28 09:36:36 2011 +0100

    Add another link to documentation

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

Summary of changes:
 server_status.php |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/server_status.php b/server_status.php
index a797446..55f72b3 100644
--- a/server_status.php
+++ b/server_status.php
@@ -605,7 +605,9 @@ foreach ($sections as $section_name => $section) {
 
 <h3 id="serverstatusqueries"><?php echo
     sprintf(__('<b>Query statistics</b>: Since its startup, %s queries have been sent to the server.'),
-        PMA_formatNumber($server_status['Questions'], 0)); ?></h3>
+        PMA_formatNumber($server_status['Questions'], 0));
+    echo PMA_showMySQLDocu('server-status-variables', 'server-status-variables', false, 'statvar_Questions');
+    ?></h3>
 
 <table id="serverstatusqueriessummary" class="data">
 <thead>
@@ -801,6 +803,8 @@ if (! empty($section['title'])) {
             }
             if ('%' === substr($name, -1, 1)) {
                 echo PMA_formatNumber($value, 0, 2) . ' %';
+            } elseif (is_numeric($value) && $value == (int) $value && $value > 1000) {
+                echo PMA_formatNumber($value, 3, 1);
             } elseif (is_numeric($value) && $value == (int) $value) {
                 echo PMA_formatNumber($value, 4, 0);
             } elseif (is_numeric($value)) {


hooks/post-receive
-- 
phpMyAdmin