Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 64f2c7b36033667354be03bf0ebf95e983b80a50 https://github.com/phpmyadmin/phpmyadmin/commit/64f2c7b36033667354be03bf0ebf... Author: Angelo Grebenarov grebenarov@gmail.com Date: 2022-07-19 (Tue, 07 July 2022) -03:00

Changed paths: M ChangeLog M js/src/sql.js

Log Message: ----------- Fixed broken filtering - ticket #17593

Fixes #17593 Closes #17610

In (Page-related settings) -> (Where to show the table row links) there are 4 options: Left, Right, Both, and Nowhere. The 3 dummy elements (mentioned in this ticket) are only needed for Left, Both, and Nowhere... and they are NOT needed for "Right". Since the main thing that distinguishes the "Right" position from the other 3 is - "colspan", my code checks for the presence of "colspan" on the first existing (non-dummy) element, and then decides whether or not to add the 3 additional dummy- elements.

Signed-off-by: Angelo Grebenarov grebenarov@gmail.com Signed-off-by: Maurício Meneghini Fauth mauricio@fauth.dev

Commit: f80862938ca85015941e09bd5d8dcb06ca643d1f https://github.com/phpmyadmin/phpmyadmin/commit/f80862938ca85015941e09bd5d8d... Author: Maurício Meneghini Fauth mauricio@fauth.dev Date: 2022-07-19 (Tue, 07 July 2022) -03:00

Changed paths: M ChangeLog M js/src/sql.js

Log Message: ----------- Merge branch 'QA_5_2'

Signed-off-by: Maurício Meneghini Fauth mauricio@fauth.dev