Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: de28889a305ba3fa73b445688d1c13be68ba4dcb https://github.com/phpmyadmin/phpmyadmin/commit/de28889a305ba3fa73b445688d1c... Author: Durgesh 007durgesh219@gmail.com Date: 2016-02-09 (Tue, 09 Feb 2016)

Changed paths: M libraries/Util.php M libraries/sanitizing.lib.php

Log Message: ----------- Fix HTML rendering in error message, Issue #11872

Signed-off-by: Durgesh 007durgesh219@gmail.com

Commit: a6eb9468b1458aebb995f27e02d2d1bea208bb6f https://github.com/phpmyadmin/phpmyadmin/commit/a6eb9468b1458aebb995f27e02d2... Author: Michal Čihař michal@cihar.com Date: 2016-02-09 (Tue, 09 Feb 2016)

Changed paths: M libraries/Util.php M libraries/sanitizing.lib.php

Log Message: ----------- Merge remote-tracking branch 'origin/pull/11880' into QA_4_6

Commit: 9016fd6a72f8989355f6d3654e16b4d36e65b981 https://github.com/phpmyadmin/phpmyadmin/commit/9016fd6a72f8989355f6d3654e16... Author: Michal Čihař michal@cihar.com Date: 2016-02-09 (Tue, 09 Feb 2016)

Changed paths: M ChangeLog

Log Message: ----------- Changelog entry for #11880

Signed-off-by: Michal Čihař michal@cihar.com

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3ebacb0025f5...9016fd6a72f8