Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 1f4b6ec0ac86574978ca2ae3d2c61c16260847a2 https://github.com/phpmyadmin/phpmyadmin/commit/1f4b6ec0ac86574978ca2ae3d2c6... Author: Michal Čihař <michal@cihar.com> Date: 2017-04-05 (Wed, 05 Apr 2017) Changed paths: M ChangeLog M libraries/Table.php M libraries/sql.lib.php Log Message: ----------- Ensure we have only integers in colum visibility and ordering data Fixes PHP error in case of invalid table preferences. Fixes #13152 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 0a135fa0ec2dad45ea51418a1f4cdd460855c88f https://github.com/phpmyadmin/phpmyadmin/commit/0a135fa0ec2dad45ea51418a1f4c... Author: Michal Čihař <michal@cihar.com> Date: 2017-04-05 (Wed, 05 Apr 2017) Changed paths: M ChangeLog M libraries/Table.php M libraries/sql.lib.php Log Message: ----------- Merge branch 'QA_4_7' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3a636ba45a66...0a135fa0ec2d