Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2d69d40fa2a42332f00c6bc439f1053f6aebdf37 https://github.com/phpmyadmin/phpmyadmin/commit/2d69d40fa2a42332f00c6bc439f1... Author: Deven Bansod devenbansod.bits@gmail.com Date: 2016-09-22 (Thu, 22 Sep 2016)

Changed paths: M libraries/controllers/table/TableSearchController.php

Log Message: ----------- Fix error in adcaf7c

Fix #12382

Signed-off-by: Deven Bansod devenbansod.bits@gmail.com

Commit: d219c4f474f5d1c8c97f7168aa695aef79cc0ca7 https://github.com/phpmyadmin/phpmyadmin/commit/d219c4f474f5d1c8c97f7168aa69... Author: Michal Čihař michal@cihar.com Date: 2016-09-22 (Thu, 22 Sep 2016)

Changed paths: M libraries/controllers/table/TableSearchController.php

Log Message: ----------- Merge pull request #12578 from devenbansod/fix_error_in_adcaf7c

Fix error in adcaf7c

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/43c5a3abdc6a...d219c4f474f5