Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: ee7d7d0b45b6b20cd51b41762df7a9f8b30cb79b https://github.com/phpmyadmin/phpmyadmin/commit/ee7d7d0b45b6b20cd51b41762df7... Author: Michal Čihař michal@cihar.com Date: 2016-09-16 (Fri, 16 Sep 2016)

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

Log Message: ----------- Fixed rendering BBCode links in setup

The URL validation needs to be adjusted for setup as the links need to go one level up.

Fixes #12512

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

Commit: ddb16a9ca1e5a1dae4c360199ef0f0baede7ab5f https://github.com/phpmyadmin/phpmyadmin/commit/ddb16a9ca1e5a1dae4c360199ef0... Author: Michal Čihař michal@cihar.com Date: 2016-09-16 (Fri, 16 Sep 2016)

Changed paths: M ChangeLog M libraries/Sanitize.php

Log Message: ----------- Merge branch 'QA_4_6'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/ccee3adaeeda...ddb16a9ca1e5