Merge branch 'QA_4_6'

phpmyadmin · Aug 3, 2016 · 3aa380a · 3aa380a
2 parents 7823e39 + 5385099
commit 3aa380a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -41,6 +41,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

diff --git a/libraries/controllers/database/DatabaseStructureController.php b/libraries/controllers/database/DatabaseStructureController.php
@@ -792,7 +792,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