Merge remote-tracking branch 'origin/master' into drizzle

1 files changed, 0 insertions, 55 deletions

diff --git a/navigation.php b/navigation.php
index 673d49d9e2..17aec64dea 100644
--- a/navigation.php
+++ b/navigation.php
@@ -4,34 +4,6 @@
  * the navigation frame - displays server, db and table selection tree
  *
  * @package phpMyAdmin
- * @uses $GLOBALS['pma']->databases
- * @uses $GLOBALS['server']
- * @uses $GLOBALS['db']
- * @uses $GLOBALS['table']
- * @uses $GLOBALS['available_languages']
- * @uses $GLOBALS['lang']
- * @uses $GLOBALS['text_dir']
- * @uses $GLOBALS['pmaThemeImage']
- * @uses $GLOBALS['cfg']['LeftFrameLight']
- * @uses $GLOBALS['cfg']['ShowTooltip']
- * @uses $GLOBALS['cfg']['ShowTooltipAliasDB']
- * @uses $GLOBALS['cfg']['DefaultTabDatabase']
- * @uses $GLOBALS['cfgRelation']['commwork']) {
- * @uses PMA_List_Database::getSingleItem()
- * @uses PMA_List_Database::getHtmlSelectGrouped()
- * @uses PMA_List_Database::getGroupedDetails()
- * @uses PMA_generate_common_url()
- * @uses PMA_generate_common_hidden_inputs()
- * @uses PMA_getDbComment();
- * @uses PMA_getTableCount()
- * @uses PMA_getTableList()
- * @uses PMA_getRelationsParam()
- * @uses PMA_outBufferPre()
- * @uses strlen()
- * @uses session_write_close()
- * @uses is_array()
- * @uses implode()
- * @uses htmlspecialchars()
  */
 
 /**
@@ -42,8 +14,6 @@ require_once './libraries/common.inc.php';
 /**
  * finish and cleanup navigation.php script execution, only to be used in navigation.php
  *
- * @uses $GLOBALS['controllink'] to close it
- * @uses $GLOBALS['userlink'] to close it
  * @access private
  */
 function PMA_exitNavigationFrame()
@@ -354,15 +324,6 @@ if ($GLOBALS['cfg']['LeftFrameLight'] && strlen($GLOBALS['db'])) {
 /**
  * displays collapsable db list
  *
- * @uses    $_REQUEST['dbgroup']
- * @uses    $GLOBALS['cfg']['DefaultTabDatabase']
- * @uses    strpos()
- * @uses    urlencode()
- * @uses    printf()
- * @uses    htmlspecialchars()
- * @uses    PMA_generate_common_url()
- * @uses    PMA_getTableList()
- * @uses    PMA_displayTableList()
  * @global  integer $element_counter
  * @global  string $img_minus
  * @global  string $img_plus
@@ -532,22 +493,6 @@ function PMA_displayDbList($ext_dblist, $offset, $count) {
  * calls itself recursively if table in given list
  * is a list itself
  *
- * @uses    is_array()
- * @uses    count()
- * @uses    urlencode()
- * @uses    strpos()
- * @uses    printf()
- * @uses    htmlspecialchars()
- * @uses    strlen()
- * @uses    is_array()
- * @uses    PMA_displayTableList()
- * @uses    $_REQUEST['tbl_group']
- * @uses    $GLOBALS['common_url_query']
- * @uses    $GLOBALS['table']
- * @uses    $GLOBALS['pmaThemeImage']
- * @uses    $GLOBALS['cfg']['LeftFrameTableSeparator']
- * @uses    $GLOBALS['cfg']['DefaultTabDatabase']
- * @uses    $GLOBALS['cfg']['DefaultTabTable']
  * @global  integer the element counter
  * @global  string  html code for '-' image
  * @global  string  html code for '+' image