Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

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

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
 ----------

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...

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

libraries/config/setup.forms.php

@@ -173,7 +173,7 @@ $forms['Navi_panel']['Navi_panel'] = array(
     'FirstLevelNavigationItems',
     'MaxNavigationItems',
     'NavigationTreeEnableGrouping',
-    'NavigationTreeDisableDatabaseExpansion',
+    'NavigationTreeEnableExpansion',
     'NavigationTreeDisplayItemFilterMinimum',
     'NumRecentTables',
     'NumFavoriteTables'

libraries/config/user_preferences.forms.php

@@ -83,7 +83,7 @@ $forms['Navi_panel']['Navi_panel'] = array(
     'FirstLevelNavigationItems',
     'MaxNavigationItems',
     'NavigationTreeEnableGrouping',
-    'NavigationTreeDisableDatabaseExpansion',
+    'NavigationTreeEnableExpansion',
     'NavigationTreeDisplayItemFilterMinimum',
     'NumRecentTables',
     'NumFavoriteTables'

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 .= '<div class="clearfloat"></div>';
         $retval .= '<ul>';
         $retval .= $this->_fastFilterHtml($this->_tree);
-        if (! $GLOBALS['cfg']['NavigationTreeDisableDatabaseExpansion']
+        if ($GLOBALS['cfg']['NavigationTreeEnableExpansion']
         ) {
             $retval .= $this->_controls();
         }

libraries/navigation/Nodes/Node.class.php

@@ -750,7 +750,7 @@ class Node
      */
     public function getCssClasses($match)
     {
-        if ($GLOBALS['cfg']['NavigationTreeDisableDatabaseExpansion']
+        if (! $GLOBALS['cfg']['NavigationTreeEnableExpansion']
         ) {
             return '';
         }
@@ -776,7 +776,7 @@ class Node
      */
     public function getIcon($match)
     {
-        if ($GLOBALS['cfg']['NavigationTreeDisableDatabaseExpansion']
+        if (! $GLOBALS['cfg']['NavigationTreeEnableExpansion']
         ) {
             return '';
         } elseif ($match && ! $this->is_group) {

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