[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15853-gb0afa4d

Michal Čihař nijel at users.sourceforge.net
Fri Aug 19 10:55:20 CEST 2011


The branch, master has been updated
       via  b0afa4d8bc904393d7c9902c95c24dd46ae88d6b (commit)
      from  381b593e5997899184e1fc7f3522f4d83bd5f025 (commit)


- Log -----------------------------------------------------------------
commit b0afa4d8bc904393d7c9902c95c24dd46ae88d6b
Author: Michal Čihař <michal at cihar.com>
Date:   Fri Aug 19 10:54:59 2011 +0200

    Wrap long lines

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

Summary of changes:
 server_status.php |   40 ++++++++++++++++++++++++++++++++--------
 1 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/server_status.php b/server_status.php
index 30c3c5a..1dd4852 100644
--- a/server_status.php
+++ b/server_status.php
@@ -673,14 +673,38 @@ $server_db_isLocal = strtolower($cfg['Server']['host']) == 'localhost'
                               || $cfg['Server']['host'] == '127.0.0.1'
                               || $cfg['Server']['host'] == '::1';
 
-PMA_AddJSVar('pma_token', $_SESSION[' PMA_token ']);
-PMA_AddJSVar('url_query', str_replace('&', '&', PMA_generate_common_url($db)));
-PMA_AddJSVar('server_time_diff', 'new Date().getTime() - ' . (microtime(true) * 1000));
-PMA_AddJSVar('server_os', PHP_OS);
-PMA_AddJSVar('is_superuser', PMA_isSuperuser() ? true : false);
-PMA_AddJSVar('server_db_isLocal', $server_db_isLocal ? true : false);
-PMA_AddJSVar('profiling_docu', PMA_showMySQLDocu('general-thread-states', 'general-thread-states'));
-PMA_AddJSVar('explain_docu', PMA_showMySQLDocu('explain-output', 'explain-output'));
+PMA_AddJSVar(
+    'pma_token',
+    $_SESSION[' PMA_token ']
+);
+PMA_AddJSVar(
+    'url_query',
+    str_replace('&', '&', PMA_generate_common_url($db))
+);
+PMA_AddJSVar(
+    'server_time_diff',
+    'new Date().getTime() - ' . (microtime(true) * 1000)
+);
+PMA_AddJSVar(
+    'server_os',
+    PHP_OS
+);
+PMA_AddJSVar(
+    'is_superuser',
+    PMA_isSuperuser()
+);
+PMA_AddJSVar(
+    'server_db_isLocal',
+    $server_db_isLocal
+);
+PMA_AddJSVar(
+    'profiling_docu',
+    PMA_showMySQLDocu('general-thread-states', 'general-thread-states')
+);
+PMA_AddJSVar(
+    'explain_docu',
+    PMA_showMySQLDocu('explain-output', 'explain-output')
+);
 
 /**
  * start output


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list