Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: d24dd24b750c879bfc35dadb2df988c97b3954c3 https://github.com/phpmyadmin/phpmyadmin/commit/d24dd24b750c879bfc35dadb2df9... Author: Michal Čihař michal@cihar.com Date: 2016-08-30 (Tue, 30 Aug 2016)

Changed paths: M libraries/Util.php

Log Message: ----------- Ensure unlim_num_rows is numberic

Fixes #12516

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

Commit: c9000876d5a157943ac21318f8450641c994d050 https://github.com/phpmyadmin/phpmyadmin/commit/c9000876d5a157943ac21318f845... Author: Michal Čihař michal@cihar.com Date: 2016-08-30 (Tue, 30 Aug 2016)

Changed paths: M po/pt_BR.po

Log Message: ----------- Merge branch 'QA_4_6' of github.com:phpmyadmin/phpmyadmin into QA_4_6

Commit: a3d811571a9312d7125b1e79311a8399d0951a1d https://github.com/phpmyadmin/phpmyadmin/commit/a3d811571a9312d7125b1e79311a... Author: Michal Čihař michal@cihar.com Date: 2016-08-30 (Tue, 30 Aug 2016)

Changed paths: M libraries/sanitizing.lib.php

Log Message: ----------- Fix <iframe> tag

Fixes #12513

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/7563c88c9b02...a3d811571a93