Branch: refs/heads/QA_4_8 Home: https://github.com/phpmyadmin/phpmyadmin Commit: fcfe9aaa2afed86b72bb39907eda03c3152cac70 https://github.com/phpmyadmin/phpmyadmin/commit/fcfe9aaa2afed86b72bb39907eda... Author: Stephane Proulx stephane@m-42.com Date: 2018-11-25 (Sun, 11 November 2018) -04:00

Changed paths: M libraries/classes/Display/Results.php

Log Message: ----------- Change expected variable to array instead of string

Whole array of sort expressions needed to correctly build "sort by key" drop down menu

Fixes bug #14339

Signed-off-by: Stephane Proulx stephane@m-42.com

Commit: 40067b254b0c1da8b85dc049de77a656b032e4ae https://github.com/phpmyadmin/phpmyadmin/commit/40067b254b0c1da8b85dc049de77... Author: Maurício Meneghini Fauth mauriciofauth@gmail.com Date: 2018-11-26 (Mon, 11 November 2018) -02:00

Changed paths: M libraries/classes/Display/Results.php

Log Message: ----------- Merge pull request #14740 from drm-wntd/fix-bug-#14339_qa4_8

Fixes bug #14339 - infinite loop in ajax