gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #19947 - Fix #19941 - Export ODS column headers by default

Browse Source 
Pull-request: #19947
Fixes: #19941
Signed-off-by: William Desportes <williamdes@wdes.fr>
This commit is contained in:
William Desportes 2025-12-17 23:37:57 +01:00
commit 4920aa2160
No known key found for this signature in database
GPG Key ID: 70684F4717D49A31
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG-6.0.md
View File

@ -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` * [#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` * [#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 * [#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 ### Removed

4
src/Config/Settings/Export.php
View File

@ -282,7 +282,7 @@ final class Export
/** /**
* ```php * ```php
* $cfg['Export']['ods_columns'] = false; * $cfg['Export']['ods_columns'] = true;
* ``` * ```
*/ */
public bool $ods_columns; public bool $ods_columns;
@ -1436,7 +1436,7 @@ final class Export
private function setOdsColumns(array $export): bool private function setOdsColumns(array $export): bool
{ {
if (! isset($export['ods_columns'])) { if (! isset($export['ods_columns'])) {
return false; return true;
} }
return (bool) $export['ods_columns']; return (bool) $export['ods_columns'];

2
src/Plugins/Export/ExportOds.php
View File

@ -284,7 +284,7 @@ class ExportOds extends ExportPlugin
StructureOrData::Data, StructureOrData::Data,
); );
$this->columns = (bool) ($request->getParsedBodyParam('ods_columns') $this->columns = (bool) ($request->getParsedBodyParam('ods_columns')
?? $exportConfig['ods_columns'] ?? false); ?? $exportConfig['ods_columns'] ?? true);
$this->null = $this->setStringValue( $this->null = $this->setStringValue(
$request->getParsedBodyParam('ods_null'), $request->getParsedBodyParam('ods_null'),
$exportConfig['ods_null'] ?? null, $exportConfig['ods_null'] ?? null,

2
tests/unit/Config/Settings/ExportTest.php
View File

@ -280,7 +280,7 @@ class ExportTest extends TestCase
yield 'invalid value 2' => [2, 0]; yield 'invalid value 2' => [2, 0];
} }
#[DataProvider('booleanWithDefaultFalseProvider')] #[DataProvider('booleanWithDefaultTrueProvider')]
public function testOdsColumns(mixed $actual, bool $expected): void public function testOdsColumns(mixed $actual, bool $expected): void
{ {
$export = new Export(['ods_columns' => $actual]); $export = new Export(['ods_columns' => $actual]);