diff --git a/ChangeLog b/ChangeLog index e31419ef01..cc8905f924 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,6 +100,7 @@ phpMyAdmin - ChangeLog - issue #13028 Always show 100% in font selector - issue #13047 Fix query simulating for more servers - issue #12846 Fix new version check for sites with wrongly configured curl +- issue #12951 When exporting to Excel, the default is now to include column names in the first row 4.6.6 (2017-01-23) - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup' diff --git a/libraries/config.default.php b/libraries/config.default.php index aac14b64a6..a5b42fe9dd 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -1662,7 +1662,7 @@ $cfg['Export']['csv_removeCRLF'] = false; * * @global boolean $cfg['Export']['excel_columns'] */ -$cfg['Export']['excel_columns'] = false; +$cfg['Export']['excel_columns'] = true; /** * diff --git a/libraries/di/Container.php b/libraries/di/Container.php index ff2bab83fd..cce98ad980 100644 --- a/libraries/di/Container.php +++ b/libraries/di/Container.php @@ -44,7 +44,7 @@ class Container * Get an object with given name and parameters * * @param string $name Name - * @param array $params Paramters + * @param array $params Parameters * * @return mixed */