Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 59d0a9fe8670e0ff01e4a38f991f4a71cd118f99 https://github.com/phpmyadmin/phpmyadmin/commit/59d0a9fe8670e0ff01e4a38f991f... Author: Michal Čihař michal@cihar.com Date: 2017-07-10 (Mon, 10 Jul 2017)

Changed paths: M libraries/Util.php

Log Message: ----------- Add sanity checking for max_count

We use it later for division, so make sure it's good for it.

Fixes #13470

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

Commit: b0393ce8235125eadbdb2e9242254bc8bb78ea44 https://github.com/phpmyadmin/phpmyadmin/commit/b0393ce8235125eadbdb2e924225... Author: Michal Čihař michal@cihar.com Date: 2017-07-10 (Mon, 10 Jul 2017)

Changed paths: M libraries/classes/Util.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/dc420e2872a8...b0393ce82351