Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: b705dc5f6784dfec60fd788e9bdaa969668fb150 https://github.com/phpmyadmin/phpmyadmin/commit/b705dc5f6784dfec60fd788e9bda... Author: Pavel Rochnyack pavel2000@ngs.ru Date: 2016-07-29 (Fri, 29 Jul 2016)

Changed paths: M libraries/controllers/server/ServerDatabasesController.php

Log Message: ----------- Fix replication status output in Server > Databases

Broken by 829a84b46e101cc5caa3a4252ea6f4453c49528d refactoring. Incorrectly fixed in c4710c3e1d20c95b6cf5081d02ac50eda86d2538

Signed-off-by: Pavel Rochnyack pavel2000@ngs.ru

Commit: 74016bceeaddcd91ddcae045de61ddec53a5ce55 https://github.com/phpmyadmin/phpmyadmin/commit/74016bceeaddcd91ddcae045de61... Author: Michal Čihař michal@cihar.com Date: 2016-07-29 (Fri, 29 Jul 2016)

Changed paths: M libraries/controllers/server/ServerDatabasesController.php

Log Message: ----------- Merge pull request #12416 from rpv-tomsk/fix-replication-status

Fix replication status output in Server > Databases

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/489970f218cd...74016bceeadd