Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: eef59d6c487102b8d78f4393096a448c9136bfa1 https://github.com/phpmyadmin/phpmyadmin/commit/eef59d6c487102b8d78f4393096a... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-10-12 (Wed, 12 Oct 2016) Changed paths: M libraries/config/ConfigFile.php M libraries/config/Validator.php Log Message: ----------- Fix order of testing DBConnection with different parameters in Config method In setup, try to follow what the docs say. 'Password login is still tried first, but as fallback, no password method is tried.' Fix #12472 Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> Commit: 5a413ae6df0ad032be2532f2b668e299fd682479 https://github.com/phpmyadmin/phpmyadmin/commit/5a413ae6df0ad032be2532f2b668... Author: Deven Bansod <devenbansod.bits@gmail.com> Date: 2016-10-12 (Wed, 12 Oct 2016) Changed paths: M test/classes/config/ConfigFileTest.php Log Message: ----------- Add tests Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com> Commit: 6a4cf7b1ec65e9cb3ff976d55e11f91fffe510dc https://github.com/phpmyadmin/phpmyadmin/commit/6a4cf7b1ec65e9cb3ff976d55e11... Author: Michal Čihař <michal@cihar.com> Date: 2016-10-17 (Mon, 17 Oct 2016) Changed paths: M libraries/config/ConfigFile.php M libraries/config/Validator.php M test/classes/config/ConfigFileTest.php Log Message: ----------- Merge pull request #12631 from devenbansod/fix_12472 Fix order of testing DBConnection with different parameters in Config method Compare: https://github.com/phpmyadmin/phpmyadmin/compare/d47956461f37...6a4cf7b1ec65