gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2015-07-27 16:14:33 +02:00
commit ea5e3e6e4a
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libraries/navigation/NavigationTree.class.php
View File

@ -42,28 +42,28 @@ class PMA_NavigationTree
private $_pos;
/**
* @var int The names of the type of items that are being paginated on
* the second level of the navigation tree. These may be
* tables, views, functions, procedures or events.
* @var array The names of the type of items that are being paginated on
* the second level of the navigation tree. These may be
* tables, views, functions, procedures or events.
*/
private $_pos2_name = array();
/**
* @var int The positions of nodes in the lists of tables, views,
* routines or events used for pagination
* @var array The positions of nodes in the lists of tables, views,
* routines or events used for pagination
*/
private $_pos2_value = array();
/**
* @var int The names of the type of items that are being paginated
* on the second level of the navigation tree.
* These may be columns or indexes
* @var array The names of the type of items that are being paginated
* on the second level of the navigation tree.
* These may be columns or indexes
*/
private $_pos3_name = array();
/**
* @var int The positions of nodes in the lists of columns or indexes
* used for pagination
* @var array The positions of nodes in the lists of columns or indexes
* used for pagination
*/
private $_pos3_value = array();
@ -82,8 +82,8 @@ class PMA_NavigationTree
private $_searchClause2 = '';
/**
* @var string Whether a warning was raised for large item groups
* which can affect performance.
* @var bool Whether a warning was raised for large item groups
* which can affect performance.
*/
private $_largeGroupWarning = false;

2
libraries/navigation/Nodes/Node.class.php
View File

@ -101,7 +101,7 @@ class Node
public $classes = '';
/**
* @var string Whether this node is a link for creating new objects
* @var bool Whether this node is a link for creating new objects
*/
public $isNew = false;