Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 265efb046fe50acb8ca277da533911414af177d3 https://github.com/phpmyadmin/phpmyadmin/commit/265efb046fe50acb8ca277da5339... Author: Michal Čihař michal@cihar.com Date: 2016-08-24 (Wed, 24 Aug 2016)

Changed paths: M libraries/sanitizing.lib.php

Log Message: ----------- Extend PMA_checkLink to cover more use cases

- allow to support mailto, ftp or http links on request - do not use multibyte functions as we're interested in first chars anyway and we're comparing against ascii ones

Issue #12479

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

Commit: 48b6dd58d8d7efa30b5330108eb3fd38f5230e23 https://github.com/phpmyadmin/phpmyadmin/commit/48b6dd58d8d7efa30b5330108eb3... Author: Michal Čihař michal@cihar.com Date: 2016-08-24 (Wed, 24 Aug 2016)

Changed paths: M ChangeLog M libraries/navigation/NavigationHeader.php M libraries/plugins/transformations/abs/TextImageLinkTransformationsPlugin.php M libraries/plugins/transformations/abs/TextLinkTransformationsPlugin.php

Log Message: ----------- Use one code to check external links

There is no good reason to duplicate the check in several places.

Fixes #12479

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

Commit: 38cf23470728537bed4330a0e669fa636d157eab https://github.com/phpmyadmin/phpmyadmin/commit/38cf23470728537bed4330a0e669... Author: Michal Čihař michal@cihar.com Date: 2016-08-24 (Wed, 24 Aug 2016)

Changed paths: M libraries/special_schema_links.lib.php

Log Message: ----------- Force relative paths in links

This way we avoid potential problem if script name resolves to a domain.

Issue #12483

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

Commit: ed6188d2c89deb7d46df958b07de5cf0ca24f2f7 https://github.com/phpmyadmin/phpmyadmin/commit/ed6188d2c89deb7d46df958b07de... Author: Michal Čihař michal@cihar.com Date: 2016-08-24 (Wed, 24 Aug 2016)

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

Log Message: ----------- Whitelist relative URLs from built in transformatons

Fixes #12483

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

Commit: cbd6137c03a7cf0db7b361bf34656e4c046d863b https://github.com/phpmyadmin/phpmyadmin/commit/cbd6137c03a7cf0db7b361bf3465... Author: Michal Čihař michal@cihar.com Date: 2016-08-24 (Wed, 24 Aug 2016)

Changed paths: M libraries/DisplayResults.php M test/classes/DisplayResultsTest.php

Log Message: ----------- Avoid double escaping of built in transformation URLs

We do already escape them in the tranformation, so avoid doing that before.

Issue #12483

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/4a9b84faa2c1...cbd6137c03a7