From 450106d83f1dafe99371ea78def4e7b6046ace74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Sat, 10 May 2014 17:00:38 +0200 Subject: [PATCH] Simplify params to _findTreeMatch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- libraries/navigation/NavigationTree.class.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libraries/navigation/NavigationTree.class.php b/libraries/navigation/NavigationTree.class.php index de7da47925..7fc1877213 100644 --- a/libraries/navigation/NavigationTree.class.php +++ b/libraries/navigation/NavigationTree.class.php @@ -799,13 +799,12 @@ class PMA_NavigationTree /** * Finds whether given tree matches this tree. * - * @param array $paths Paths to check - * @param array $tree Tree to check - * @param string $attribute Attribute to walk + * @param array $tree Tree to check + * @param array $paths Paths to check * * @return boolean */ - private function _findTreeMatch($paths, $tree, $attribute) + private function _findTreeMatch($tree, $paths) { $match = true; foreach ($tree as $path) { @@ -876,8 +875,8 @@ class PMA_NavigationTree $retval .= ""; } - $match = $this->_findTreeMatch($paths, $this->_aPath, 'aPath_clean'); - $match |= $this->_findTreeMatch($paths, $this->_vPath, 'vPath_clean'); + $match = $this->_findTreeMatch($this->_aPath, $paths['aPath_clean']); + $match |= $this->_findTreeMatch($this->_vPath, $paths['vPath_clean']); $retval .= '