From ef4411cd2dee866d9a13dff24bb6f0456c7e5cd8 Mon Sep 17 00:00:00 2001 From: Chirayu Chiripal Date: Thu, 26 Feb 2015 20:39:19 +0530 Subject: [PATCH] Fix coding style in libraries/navigation/* Signed-off-by: Chirayu Chiripal --- libraries/navigation/NavigationTree.class.php | 2 +- libraries/navigation/Nodes/Node.class.php | 2 +- libraries/navigation/Nodes/Node_Database.class.php | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libraries/navigation/NavigationTree.class.php b/libraries/navigation/NavigationTree.class.php index 219d96a19f..91009c98e1 100644 --- a/libraries/navigation/NavigationTree.class.php +++ b/libraries/navigation/NavigationTree.class.php @@ -948,7 +948,7 @@ class PMA_NavigationTree if ($node->hasSiblings() || $node->realParent() === false ) { - if ( $node->type == Node::CONTAINER + if ($node->type == Node::CONTAINER && count($node->children) == 0 && $GLOBALS['is_ajax_request'] != true ) { diff --git a/libraries/navigation/Nodes/Node.class.php b/libraries/navigation/Nodes/Node.class.php index b632708287..1bb1f08c09 100644 --- a/libraries/navigation/Nodes/Node.class.php +++ b/libraries/navigation/Nodes/Node.class.php @@ -217,7 +217,7 @@ class Node } $parent = $this->parent; while (isset($parent)) { - if ( ($parent->type != Node::CONTAINER || $containers) + if (($parent->type != Node::CONTAINER || $containers) && ($parent->is_group != true || $groups) ) { $parents[] = $parent; diff --git a/libraries/navigation/Nodes/Node_Database.class.php b/libraries/navigation/Nodes/Node_Database.class.php index 608427d8de..29fd5248de 100644 --- a/libraries/navigation/Nodes/Node_Database.class.php +++ b/libraries/navigation/Nodes/Node_Database.class.php @@ -92,7 +92,7 @@ class Node_Database extends Node /** * Returns the number of tables or views present inside this database * - * @param string $which tables|views + * @param string $which tables|views * @param string $searchClause A string used to filter the results of * the query * @param boolean $singleItem Whether to get presence of a single known @@ -385,7 +385,7 @@ class Node_Database extends Node /** * Returns the list of tables or views inside this database * - * @param string $which tables|views + * @param string $which tables|views * @param int $pos The offset of the list within the results * @param string $searchClause A string used to filter the results of the query * @@ -478,7 +478,7 @@ class Node_Database extends Node /** * Returns the list of procedures or functions inside this database * - * @param string $routineType PROCEDURE|FUNCTION + * @param string $routineType PROCEDURE|FUNCTION * @param int $pos The offset of the list within the results * @param string $searchClause A string used to filter the results of the query * @@ -621,7 +621,7 @@ class Node_Database extends Node $ret = ''; $cfgRelation = PMA_getRelationsParam(); if (isset($cfgRelation['navwork']) && $cfgRelation['navwork']) { - if ( $this->_hiddenCount > 0) { + if ($this->_hiddenCount > 0) { $ret = '' . '