diff --git a/db_qbe.php b/db_qbe.php index b57fd31027..2fcc52d37d 100644 --- a/db_qbe.php +++ b/db_qbe.php @@ -22,7 +22,7 @@ $cfgRelation = PMA_getRelationsParam(); $savedSearchList = array(); $savedSearch = null; $currentSearchId = null; -if (isset($cfgRelation['savedsearcheswork']) && $cfgRelation['savedsearcheswork']) { +if ($cfgRelation['savedsearcheswork']) { include 'libraries/SavedSearches.class.php'; $header = $response->getHeader(); $scripts = $header->getScripts(); diff --git a/libraries/Menu.class.php b/libraries/Menu.class.php index 51ee5ee1bf..a574a36056 100644 --- a/libraries/Menu.class.php +++ b/libraries/Menu.class.php @@ -129,7 +129,7 @@ class PMA_Menu { $allowedTabs = PMA_Util::getMenuTabList($level); $cfgRelation = PMA_getRelationsParam(); - if (isset($cfgRelation['menuswork']) && $cfgRelation['menuswork']) { + if ($cfgRelation['menuswork']) { $groupTable = PMA_Util::backquote($cfgRelation['db']) . "." . PMA_Util::backquote($cfgRelation['usergroups']); @@ -500,7 +500,6 @@ class PMA_Menu } if (! $db_is_system_schema - && isset($cfgRelation['centralcolumnswork']) && $cfgRelation['centralcolumnswork'] ) { $tabs['central_columns']['text'] = __('Central columns'); diff --git a/libraries/central_columns.lib.php b/libraries/central_columns.lib.php index 63e696c9e7..05dd28305b 100644 --- a/libraries/central_columns.lib.php +++ b/libraries/central_columns.lib.php @@ -27,9 +27,7 @@ function PMA_centralColumnsGetParams() $cfgRelation = PMA_getRelationsParam(); - if (isset($cfgRelation['centralcolumnswork']) - && $cfgRelation['centralcolumnswork'] - ) { + if ($cfgRelation['centralcolumnswork']) { $cfgCentralColumns = array( 'user' => $GLOBALS['cfg']['Server']['user'], 'db' => $cfgRelation['db'], diff --git a/libraries/navigation/Nodes/Node.class.php b/libraries/navigation/Nodes/Node.class.php index 96aefe1bb3..66b7df6f57 100644 --- a/libraries/navigation/Nodes/Node.class.php +++ b/libraries/navigation/Nodes/Node.class.php @@ -798,7 +798,7 @@ class Node public function getNavigationHidingData() { $cfgRelation = PMA_getRelationsParam(); - if (isset($cfgRelation['navwork']) && $cfgRelation['navwork']) { + if ($cfgRelation['navwork']) { $navTable = PMA_Util::backquote($cfgRelation['db']) . "." . PMA_Util::backquote($cfgRelation['navigationhiding']); $sqlQuery = "SELECT `db_name`, COUNT(*) AS `count` FROM " . $navTable diff --git a/libraries/navigation/Nodes/Node_Database.class.php b/libraries/navigation/Nodes/Node_Database.class.php index 6464e21a41..27bc5824a2 100644 --- a/libraries/navigation/Nodes/Node_Database.class.php +++ b/libraries/navigation/Nodes/Node_Database.class.php @@ -360,7 +360,7 @@ class Node_Database extends Node // Remove hidden items so that they are not displayed in navigation tree $cfgRelation = PMA_getRelationsParam(); - if (isset($cfgRelation['navwork']) && $cfgRelation['navwork']) { + if ($cfgRelation['navwork']) { $hiddenItems = $this->getHiddenItems(substr($type, 0, -1)); foreach ($retval as $key => $item) { if (in_array($item, $hiddenItems)) { @@ -648,7 +648,7 @@ class Node_Database extends Node { $ret = ''; $cfgRelation = PMA_getRelationsParam(); - if (isset($cfgRelation['navwork']) && $cfgRelation['navwork']) { + if ($cfgRelation['navwork']) { if ($this->hiddenCount > 0) { $ret = '' . '' diff --git a/libraries/relation_cleanup.lib.php b/libraries/relation_cleanup.lib.php index f1e176e7d2..ecb9e7fb6c 100644 --- a/libraries/relation_cleanup.lib.php +++ b/libraries/relation_cleanup.lib.php @@ -203,9 +203,7 @@ function PMA_relationsCleanupDatabase($db) PMA_queryAsControlUser($remove_query); } - if (isset($cfgRelation['centralcolumnswork']) - && $cfgRelation['centralcolumnswork'] - ) { + if ($cfgRelation['centralcolumnswork']) { $remove_query = 'DELETE FROM ' . PMA_Util::backquote($cfgRelation['db']) . '.' . PMA_Util::backquote($cfgRelation['central_columns']) . ' WHERE db_name = \'' . PMA_Util::sqlAddSlashes($db) . '\''; diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php index 2ab834464c..301b2838eb 100644 --- a/libraries/server_privileges.lib.php +++ b/libraries/server_privileges.lib.php @@ -2630,7 +2630,7 @@ function PMA_getExtraDataForAjaxBehavior( . '' . "\n"; } - if (isset($cfgRelation['menuswork']) && $user_group_count > 0) { + if ($cfgRelation['menuswork'] && $user_group_count > 0) { $new_user_string .= '