Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 827ff5715a4fe8e2d8eee37ad2f759c4f551e5f4 https://github.com/phpmyadmin/phpmyadmin/commit/827ff5715a4fe8e2d8eee37ad2f7... Author: Michal Čihař <michal@cihar.com> Date: 2017-01-20 (Fri, 20 Jan 2017) Changed paths: M ChangeLog M libraries/DbSearch.php Log Message: ----------- Fix database search with newer php-gettext We really need integer from count query. Fixes #12881 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: c81a10f528251f6bd9b249e1ab8f46b285212a6d https://github.com/phpmyadmin/phpmyadmin/commit/c81a10f528251f6bd9b249e1ab8f... Author: Michal Čihař <michal@cihar.com> Date: 2017-01-20 (Fri, 20 Jan 2017) Changed paths: M ChangeLog M libraries/DbSearch.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8a805fde91c1...c81a10f52825