diff options
| author | Christian Foellmann <foellmann@foe-services.de> | 2014-12-23 14:48:13 +0300 |
|---|---|---|
| committer | Christian Foellmann <foellmann@foe-services.de> | 2014-12-23 14:48:13 +0300 |
| commit | 2bfb20e57418ebf396149782be9f98e868fe8608 (patch) | |
| tree | a5ec4011410970603d3f462a535a5a359057fa77 /libraries/server_common.inc.php | |
| parent | 20f1bf77c8281efc675a14e0f6bf52f657dabd9a (diff) | |
UPDATE 4.3.34.3.3
Diffstat (limited to 'libraries/server_common.inc.php')
| -rw-r--r-- | libraries/server_common.inc.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libraries/server_common.inc.php b/libraries/server_common.inc.php index 19f3845321..1b69ba3808 100644 --- a/libraries/server_common.inc.php +++ b/libraries/server_common.inc.php @@ -22,21 +22,23 @@ if (empty($viewing_mode)) { /** * Set parameters for links */ -$url_query = PMA_URL_getCommon($db); +$GLOBALS['url_query'] = PMA_URL_getCommon(array('db' => $db)); /** * Defines the urls to return to in case of error in a sql statement */ -$err_url = 'index.php' . $url_query; +$err_url = 'index.php' . $GLOBALS['url_query']; /** * @global boolean Checks for superuser privileges */ -$is_superuser = $GLOBALS['dbi']->isSuperuser(); +$GLOBALS['is_superuser'] = $GLOBALS['dbi']->isSuperuser(); +$GLOBALS['is_grantuser'] = $GLOBALS['dbi']->isUserType('grant'); +$GLOBALS['is_createuser'] = $GLOBALS['dbi']->isUserType('create'); // now, select the mysql db -if ($is_superuser && ! PMA_DRIZZLE) { - $GLOBALS['dbi']->selectDb('mysql', $userlink); +if ($GLOBALS['is_superuser'] && ! PMA_DRIZZLE) { + $GLOBALS['dbi']->selectDb('mysql', $GLOBALS['userlink']); } PMA_Util::checkParameters( |