From 9d3da1b4084928f03bab680b908c47a396b64f27 Mon Sep 17 00:00:00 2001 From: Pavel Rochnyack Date: Mon, 1 Aug 2016 03:37:20 +0100 Subject: [PATCH 1/2] Fix replication status output in database tables list. Issue is second part to #12416 Signed-off-by: Pavel Rochnyack --- libraries/controllers/database/DatabaseStructureController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/controllers/database/DatabaseStructureController.php b/libraries/controllers/database/DatabaseStructureController.php index 3c02a015107d..cd22393f35b5 100644 --- a/libraries/controllers/database/DatabaseStructureController.php +++ b/libraries/controllers/database/DatabaseStructureController.php @@ -790,7 +790,7 @@ protected function getReplicationStatus($table) $do = strlen($searchDoDBInTruename) > 0 || strlen($searchDoDBInDB) > 0 - || ($nbServSlaveDoDb == 1 && $nbServSlaveIgnoreDb == 1) + || ($nbServSlaveDoDb == 0 && $nbServSlaveIgnoreDb == 0) || $this->hasTable( $GLOBALS['replication_info']['slave']['Wild_Do_Table'], $table From 5385099b4013512c39baf7031c38ea9f3ae137ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 3 Aug 2016 10:01:44 +0200 Subject: [PATCH 2/2] Changelog for issue #12423 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixed replication status in database listing Signed-off-by: Michal Čihař --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 902c9c3d40b2..ae94ade67a30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ phpMyAdmin - ChangeLog - issue #12339 Do not error on unset server port - issue #12422 Improvements to the original theme - issue #12395 Do not try to load old transformation plugins +- issue #12423 Fixed replication status in database listing 4.6.3 (2016-06-23) - issue #12249 Fixed cookie path on Windows