Branch: refs/heads/QA_5_2 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6fc1401ee285711786d1fbdb1946569428a0a60e https://github.com/phpmyadmin/phpmyadmin/commit/6fc1401ee285711786d1fbdb1946... Author: Scott Mcgowan <scott.mcgowan@appian.com> Date: 2022-11-25 (Fri, 11 November 2022) +01:00 Changed paths: M libraries/classes/Config/Settings/Export.php M libraries/classes/Plugins/Export/ExportCsv.php M libraries/config.default.php M test/classes/Config/Settings/ExportTest.php M test/classes/Plugins/Export/ExportCsvTest.php Log Message: ----------- Fix column names option for CSV Export Previously work was done to enable column names in CSV exports by default. This change actually ended up overwriting the column name value so that column names were included in all exports regardless of whether or not the property was disabled. This commit changes the default for column names to enabled as the original change intended, and removes the property overwrite. Signed-off-by: Scott McGowan mcgowanscott16@gmail.com Commit: 997877a14f5be8a573cd7a69df9fabde63bb5917 https://github.com/phpmyadmin/phpmyadmin/commit/997877a14f5be8a573cd7a69df9f... Author: William Desportes <williamdes@wdes.fr> Date: 2022-11-25 (Fri, 11 November 2022) +01:00 Changed paths: M libraries/classes/Config/Settings/Export.php M libraries/classes/Plugins/Export/ExportCsv.php M libraries/config.default.php M test/classes/Config/Settings/ExportTest.php M test/classes/Plugins/Export/ExportCsvTest.php Log Message: ----------- Merge #17814 - Fix column names option for CSV Export Pull-request: #17814 Ref: #14076 Ref: #14007 Signed-off-by: William Desportes <williamdes@wdes.fr> Commit: 70c0b2472f524c8f20e9f28641b08e13b6163ec7 https://github.com/phpmyadmin/phpmyadmin/commit/70c0b2472f524c8f20e9f28641b0... Author: William Desportes <williamdes@wdes.fr> Date: 2022-11-25 (Fri, 11 November 2022) +01:00 Changed paths: M ChangeLog Log Message: ----------- Add a ChangeLog entry for 997877a14f Ref: 997877a14f5be8a573cd7a69df9fabde63bb5917 Signed-off-by: William Desportes <williamdes@wdes.fr>