diff --git a/CHANGELOG-6.0.md b/CHANGELOG-6.0.md index 34fde0ae2c..e979ae1ca5 100644 --- a/CHANGELOG-6.0.md +++ b/CHANGELOG-6.0.md @@ -81,6 +81,7 @@ All notable changes of the phpMyAdmin 6.0 release series are documented in this * [#19794](https://github.com/phpmyadmin/phpmyadmin/pull/19794): Use `jquery-ui-timepicker-addon.min.js` instead of `jquery-ui-timepicker-addon.js` * [#19795](https://github.com/phpmyadmin/phpmyadmin/pull/19795): Use `additional-methods.min.js` instead of `additional-methods.js` * [#19564](https://github.com/phpmyadmin/phpmyadmin/pull/19564): Update the table comment field to a textarea +* [#19947](https://github.com/phpmyadmin/phpmyadmin/pull/19947): Export ODS column headers by default ### Removed diff --git a/src/Config/Settings/Export.php b/src/Config/Settings/Export.php index e048da6a9f..e5ac8c0e7d 100644 --- a/src/Config/Settings/Export.php +++ b/src/Config/Settings/Export.php @@ -282,7 +282,7 @@ final class Export /** * ```php - * $cfg['Export']['ods_columns'] = false; + * $cfg['Export']['ods_columns'] = true; * ``` */ public bool $ods_columns; @@ -1436,7 +1436,7 @@ final class Export private function setOdsColumns(array $export): bool { if (! isset($export['ods_columns'])) { - return false; + return true; } return (bool) $export['ods_columns']; diff --git a/src/Plugins/Export/ExportOds.php b/src/Plugins/Export/ExportOds.php index ada82672b5..b90bb831a4 100644 --- a/src/Plugins/Export/ExportOds.php +++ b/src/Plugins/Export/ExportOds.php @@ -284,7 +284,7 @@ class ExportOds extends ExportPlugin StructureOrData::Data, ); $this->columns = (bool) ($request->getParsedBodyParam('ods_columns') - ?? $exportConfig['ods_columns'] ?? false); + ?? $exportConfig['ods_columns'] ?? true); $this->null = $this->setStringValue( $request->getParsedBodyParam('ods_null'), $exportConfig['ods_null'] ?? null, diff --git a/tests/unit/Config/Settings/ExportTest.php b/tests/unit/Config/Settings/ExportTest.php index 1802befb83..1b12002289 100644 --- a/tests/unit/Config/Settings/ExportTest.php +++ b/tests/unit/Config/Settings/ExportTest.php @@ -280,7 +280,7 @@ class ExportTest extends TestCase yield 'invalid value 2' => [2, 0]; } - #[DataProvider('booleanWithDefaultFalseProvider')] + #[DataProvider('booleanWithDefaultTrueProvider')] public function testOdsColumns(mixed $actual, bool $expected): void { $export = new Export(['ods_columns' => $actual]);