Update documentation.

Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
phpmyadmin · Apr 22, 2014 · ebc2739 · ebc2739
1 parent 3319c63
commit ebc2739
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/doc/config.rst b/doc/config.rst
@@ -1379,16 +1379,16 @@ Navigation panel setup
     :type: integer
     :default: 25
 
-    The number of items that can be displayed on each page of the first level
+    The number of first level databases that can be displayed on each page
     of navigation tree.
 
 .. config:option:: $cfg['MaxNavigationItems']
 
     :type: integer
     :default: 250
 
-    The number of items that can be displayed on each page of the
-    navigation tree.
+    The number of items (tables, columns, indexes) that can be displayed on each
+    page of the navigation tree.
 
 .. config:option:: $cfg['NavigationTreeEnableGrouping']
 

diff --git a/libraries/config.default.php b/libraries/config.default.php
@@ -848,7 +848,7 @@
  */
 
 /**
- * maximum number of items displayed on first level in navigation panel
+ * maximum number of first level databases displayed in navigation panel
  *
  * @global integer $cfg['FirstLevelNavigationItems']
  */

diff --git a/test/classes/navigation/PMA_Node_test.php b/test/classes/navigation/PMA_Node_test.php
@@ -342,7 +342,7 @@ public function testGetData()
         if (! isset($GLOBALS['cfg'])) {
             $GLOBALS['cfg'] = array();
         }
-        $GLOBALS['cfg']['MaxNavigationItems'] = $limit;
+        $GLOBALS['cfg']['FirstLevelNavigationItems'] = $limit;
 
         $expectedSql  = "SELECT `SCHEMA_NAME` ";
         $expectedSql .= "FROM `INFORMATION_SCHEMA`.`SCHEMATA` ";