Skip to content

Commit

Permalink
Move the MaxNavigationItems directive to the Navigation panel section…
Browse files Browse the repository at this point in the history
… (doc and default config)
  • Loading branch information
Marc Delisle committed Nov 24, 2013
1 parent 96417c4 commit d34e84e
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
16 changes: 8 additions & 8 deletions doc/config.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1133,14 +1133,6 @@ Generic settings
The maximum number of database names to be displayed in the main panel's
database list.

.. config:option:: $cfg['MaxNavigationItems']
:type: integer
:default: 250

The number of items that can be displayed on each page of the
navigation tree.

.. config:option:: $cfg['MaxTableList']
:type: integer
Expand Down Expand Up @@ -1404,6 +1396,14 @@ Cookie authentication options
Navigation panel setup
----------------------

.. config:option:: $cfg['MaxNavigationItems']
:type: integer
:default: 250

The number of items that can be displayed on each page of the
navigation tree.

.. config:option:: $cfg['NavigationTreeEnableGrouping']
:type: boolean
Expand Down
14 changes: 7 additions & 7 deletions libraries/config.default.php
Original file line number Diff line number Diff line change
Expand Up @@ -641,13 +641,6 @@
*/
$cfg['MaxDbList'] = 100;

/**
* maximum number of items displayed in navigation panel
*
* @global integer $cfg['MaxDbList']
*/
$cfg['MaxNavigationItems'] = 250;

/**
* maximum number of tables displayed in table list
*
Expand Down Expand Up @@ -871,6 +864,13 @@
* Navigation panel setup
*/

/**
* maximum number of items displayed in navigation panel
*
* @global integer $cfg['MaxDbList']
*/
$cfg['MaxNavigationItems'] = 250;

/**
* turn the select-based light menu into a tree
*
Expand Down

0 comments on commit d34e84e

Please sign in to comment.