From 0b088f6790a6b2674f5037b4a529afbcd4d60ddd Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Wed, 8 Mar 2017 09:37:45 -0500 Subject: [PATCH 1/2] Change defaults when exporting to Excel; now we include field/column names as the first row. This is always configurable via $cfg['Export']['excel_columns'] Fixes #12951 Signed-off-by: Isaac Bennetch --- ChangeLog | 1 + libraries/config.default.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0baa6acc25..f768a6eccd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -95,6 +95,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 061ee88bf6..4aca4a657e 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; /** * From 6d6dc8161754a9ab8946314ff4e92f070dadae18 Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Wed, 8 Mar 2017 09:39:53 -0500 Subject: [PATCH 2/2] Fix small typo in function comment Signed-off-by: Isaac Bennetch --- libraries/di/Container.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 */