[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 3ad6f4: Fix Sort By Key issue #15475

Branch: refs/heads/QA_5_0 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 3ad6f48ad37aa410326f2ccc8b726cf51aab20ca https://github.com/phpmyadmin/phpmyadmin/commit/3ad6f48ad37aa410326f2ccc8b7… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-10-30 (Wed, 10 October 2019) +01:00 Changed paths: M js/sql.js Log Message: ----------- Fix Sort By Key issue #15475 Fixes: #15475 Co-authored-by: Vitalii Medvediev <vitaliim(a)onehourtranslation.com> Signed-off-by: William Desportes <williamdes(a)wdes.fr> Signed-off-by: Vitalii Medvediev <vitaliim(a)onehourtranslation.com> Commit: 44e168d7d33f4d15d4b16056f32b9db24b5f8bf9 https://github.com/phpmyadmin/phpmyadmin/commit/44e168d7d33f4d15d4b16056f32… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-10-30 (Wed, 10 October 2019) +01:00 Changed paths: M js/sql.js Log Message: ----------- Merge #15537 - Sort By Key issues Fixes: #15475 Pull-request: #15537 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 77d156c321172e80e047c3c54dd7fc1d7a1a05fa https://github.com/phpmyadmin/phpmyadmin/commit/77d156c321172e80e047c3c54dd… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-10-30 (Wed, 10 October 2019) +01:00 Changed paths: M ChangeLog Log Message: ----------- Add ChangeLog entry for #15475 Ref: 44e168d7d33f4d15d4b16056f32b9db24b5f8bf9 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: 128d3a09a0392a5a0a6c4e6ea9aefcd8ddf9efca https://github.com/phpmyadmin/phpmyadmin/commit/128d3a09a0392a5a0a6c4e6ea9a… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-10-30 (Wed, 10 October 2019) +01:00 Changed paths: M libraries/classes/Navigation/NavigationTree.php Log Message: ----------- Fix #15540 - Uncaught TypeError: htmlspecialchars() in NavigationTree Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: cbdc5c0e833f5f5cffdcf6782d9409ca94ce127b https://github.com/phpmyadmin/phpmyadmin/commit/cbdc5c0e833f5f5cffdcf6782d9… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-10-30 (Wed, 10 October 2019) +01:00 Changed paths: M ChangeLog M js/sql.js M libraries/classes/Navigation/NavigationTree.php Log Message: ----------- Merge branch 'QA_4_9' into QA_5_0 Signed-off-by: William Desportes <williamdes(a)wdes.fr> Commit: ab0b6e248a9c77c782f1274a63ea426d40cc300d https://github.com/phpmyadmin/phpmyadmin/commit/ab0b6e248a9c77c782f1274a63e… Author: William Desportes <williamdes(a)wdes.fr> Date: 2019-10-30 (Wed, 10 October 2019) +01:00 Changed paths: M ChangeLog Log Message: ----------- Add ChangeLog entry for #15540 Ref: 128d3a09a0392a5a0a6c4e6ea9aefcd8ddf9efca Yes, the commit comes from QA 4.9 and the ChangeLog is QA 5.0 This is because 4.9 users are not affected but they can still have the fix. Signed-off-by: William Desportes <williamdes(a)wdes.fr>