Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0b1c18270301b1e4b741c1c6a89480b813965726 https://github.com/phpmyadmin/phpmyadmin/commit/0b1c18270301b1e4b741c1c6a894... Author: Michal Čihař michal@cihar.com Date: 2017-02-14 (Tue, 14 Feb 2017)

Changed paths: M libraries/URL.php

Log Message: ----------- Fix nested hidden inputs

We do not want to inject token there.

Fixes #12999

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

Commit: 563036022c9567f4bc5aefe845a518d10657b6f9 https://github.com/phpmyadmin/phpmyadmin/commit/563036022c9567f4bc5aefe845a5... Author: Michal Čihař michal@cihar.com Date: 2017-02-14 (Tue, 14 Feb 2017)

Changed paths: M libraries/URL.php

Log Message: ----------- Merge branch 'QA_4_7'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/fb25d6262b20...563036022c95