From a439bb1e8730058ab2ed438de0a60b63454fbc80 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 24 Feb 2015 09:27:17 -0500 Subject: [PATCH 1/6] Mention new way of announcing the release on Twitter Signed-off-by: Marc Delisle --- scripts/create-release.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/create-release.sh b/scripts/create-release.sh index 13fc53dfd8..dcba2c5019 100755 --- a/scripts/create-release.sh +++ b/scripts/create-release.sh @@ -306,7 +306,7 @@ Todo now: 8. add a milestone for this new version in the bugs tickets, at https://sourceforge.net/p/phpmyadmin/bugs/milestones - 9. send a private twitter message to @phpmya, containing a short version of the announcement + 9. tweet from @phpmya a link to the release notes (see item 5 above); your account should be added to TweetDeck to ease this posting 10. for a stable version, update demo/php/versions.ini in the scripts repository so that the demo server shows current versions From df7f409f1b68f28865288faaaa725a038906549c Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 24 Feb 2015 13:10:48 -0500 Subject: [PATCH 2/6] rfe #1575 "Disable database expansion" : unclear directive name and explanation Signed-off-by: Marc Delisle --- ChangeLog | 2 ++ doc/config.rst | 4 ++-- libraries/config.default.php | 4 ++-- libraries/config/messages.inc.php | 8 ++++---- libraries/config/setup.forms.php | 2 +- libraries/config/user_preferences.forms.php | 2 +- libraries/navigation/NavigationTree.class.php | 4 ++-- libraries/navigation/Nodes/Node.class.php | 4 ++-- 8 files changed, 16 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index c79a73d1e1..815c7b843e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,6 +57,8 @@ phpMyAdmin - ChangeLog + rfe #1606 processlist filter + rfe Change tracking activation status from db level tracking page + rfe #1207 Export users associated with a specific schema/database ++ rfe #1575 "Disable database expansion" : unclear directive name and +explanation 4.3.11.0 (not yet released) - bug #4774 SQL links are completely wrong diff --git a/doc/config.rst b/doc/config.rst index 26e0739d55..4981bd0045 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -1592,12 +1592,12 @@ Navigation panel setup * ``tbl_change.php`` * ``sql.php`` -.. config:option:: $cfg['NavigationTreeDisableDatabaseExpansion'] +.. config:option:: $cfg['NavigationTreeEnableExpansion'] :type: boolean :default: false - Whether or not to disable the possibility of databases expansion in the navigation panel + Whether to offer the possibility of tree expansion in the navigation panel. Main panel ---------- diff --git a/libraries/config.default.php b/libraries/config.default.php index 817ac73869..8b0798dcd0 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -982,9 +982,9 @@ $cfg['NavigationTreeDefaultTabTable2'] = ''; /** * Disables the possibility of database expansion * - * @global boolean $cfg['DisableDatabaseExpansion'] + * @global boolean $cfg['NavigationTreeEnableExpansion'] */ -$cfg['NavigationTreeDisableDatabaseExpansion'] = false; +$cfg['NavigationTreeEnableExpansion'] = true; /******************************************************************************* * In the main panel, at startup... diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php index a4c219882b..cf2b97d3c9 100644 --- a/libraries/config/messages.inc.php +++ b/libraries/config/messages.inc.php @@ -460,10 +460,10 @@ $strConfigNavigationTreeTableLevel_name = __('Maximum table tree depth'); $strConfigNavigationTreePointerEnable_desc = __('Highlight server under the mouse cursor.'); $strConfigNavigationTreePointerEnable_name = __('Enable highlighting'); -$strConfigNavigationTreeDisableDatabaseExpansion_desc - = __('Whether to disable the possibility of database expansion or not.'); -$strConfigNavigationTreeDisableDatabaseExpansion_name - = __('Disable database expansion'); +$strConfigNavigationTreeEnableExpansion_desc + = __('Whether to offer the possibility of tree expansion in the navigation panel.'); +$strConfigNavigationTreeEnableExpansion_name + = __('Enable navigation tree expansion'); $strConfigNumRecentTables_desc = __('Maximum number of recently used tables; set 0 to disable.'); $strConfigNumFavoriteTables_desc diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php index fa22ba0bc8..90083a7625 100644 --- a/libraries/config/setup.forms.php +++ b/libraries/config/setup.forms.php @@ -173,7 +173,7 @@ $forms['Navi_panel']['Navi_panel'] = array( 'FirstLevelNavigationItems', 'MaxNavigationItems', 'NavigationTreeEnableGrouping', - 'NavigationTreeDisableDatabaseExpansion', + 'NavigationTreeEnableExpansion', 'NavigationTreeDisplayItemFilterMinimum', 'NumRecentTables', 'NumFavoriteTables' diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php index 06825004dc..150642e93f 100644 --- a/libraries/config/user_preferences.forms.php +++ b/libraries/config/user_preferences.forms.php @@ -83,7 +83,7 @@ $forms['Navi_panel']['Navi_panel'] = array( 'FirstLevelNavigationItems', 'MaxNavigationItems', 'NavigationTreeEnableGrouping', - 'NavigationTreeDisableDatabaseExpansion', + 'NavigationTreeEnableExpansion', 'NavigationTreeDisplayItemFilterMinimum', 'NumRecentTables', 'NumFavoriteTables' diff --git a/libraries/navigation/NavigationTree.class.php b/libraries/navigation/NavigationTree.class.php index e05dcfb217..219d96a19f 100644 --- a/libraries/navigation/NavigationTree.class.php +++ b/libraries/navigation/NavigationTree.class.php @@ -629,7 +629,7 @@ class PMA_NavigationTree public function groupNode($node) { if ($node->type != Node::CONTAINER - || $GLOBALS['cfg']['NavigationTreeDisableDatabaseExpansion'] + || ! $GLOBALS['cfg']['NavigationTreeEnableExpansion'] ) { return; } @@ -774,7 +774,7 @@ class PMA_NavigationTree $retval .= '
'; $retval .= '