From 9a994756f8a17f3a3f7e29c0ec2c131c2e9e37fe Mon Sep 17 00:00:00 2001
From: Marc Delisle
Date: Thu, 18 Jun 2009 16:36:37 +0000
Subject: [PATCH] Incorrect display in replication status
---
ChangeLog | 2 ++
server_status.php | 22 ++++++++++------------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5b663d395..430b385f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #2799009 Login with ipv6 IP address breaks redirect
- bug #2796066 [priv] Inconsistent display of databases list
- bug #2802870 [display] Incorrect overhead value for InnoDB
+- bug [display] Incorrect display in replication status,
+ thanks to Tomas Srnka - tomassrnka
3.2.0.0 (2009-06-15)
- [core] better support for vendor customisation (based on what Debian needs)
diff --git a/server_status.php b/server_status.php
index 1e071b61d..a0c7d10b8 100644
--- a/server_status.php
+++ b/server_status.php
@@ -423,19 +423,17 @@ echo sprintf($strServerStatusUptime,
' . $type . ' ';
+if ($server_master_status_run || $server_slave_status_run) {
+ $replicationOut = "";
+ foreach ($replication_types as $type) {
+ if (${"server_{$type}_status_run"}) {
+ if ($replicationOut != "") {
+ $replicationOut .= $strAndSmall . ' ';
+ }
+ $replicationOut .= '' . $type . ' ';
+ }
}
- }
- echo sprintf('' . $strReplicationStatusInfo . '
', $replicationOut);
+ echo sprintf('' . $strReplicationStatusInfo . '
', $replicationOut);
}
?>