gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5

Browse Source
This commit is contained in:
Weblate 2015-10-24 22:27:27 +02:00
commit fa16adca88
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libraries/check_user_privileges.lib.php
View File

@ -39,6 +39,22 @@ function PMA_checkRequiredPrivilegesForFlushing()
*/
function PMA_checkRequiredPrivilgesForAdjust()
{
if (PMA_Util::cacheExists('db_priv')) {
$GLOBALS['db_priv'] = PMA_Util::cacheGet(
'db_priv'
);
$GLOBALS['col_priv'] = PMA_Util::cacheGet(
'col_priv'
);
$GLOBALS['table_priv'] = PMA_Util::cacheGet(
'table_priv'
);
$GLOBALS['proc_priv'] = PMA_Util::cacheGet(
'proc_priv'
);
return;
}
$privs_available = true;
// FOR DB PRIVS
$select_privs_available = $GLOBALS['dbi']->tryQuery(
@ -214,6 +230,12 @@ function PMA_checkRequiredPrivilgesForAdjust()
// Save the value
$GLOBALS['proc_priv'] = $privs_available;
// must also cacheUnset() them in
// libraries/plugins/auth/AuthenticationCookie.class.php
PMA_Util::cacheSet('proc_priv', $GLOBALS['proc_priv']);
PMA_Util::cacheSet('table_priv', $GLOBALS['table_priv']);
PMA_Util::cacheSet('col_priv', $GLOBALS['col_priv']);
PMA_Util::cacheSet('db_priv', $GLOBALS['db_priv']);
}
/**

5
libraries/plugins/auth/AuthenticationCookie.class.php
View File

@ -444,6 +444,11 @@ class AuthenticationCookie extends AuthenticationPlugin
PMA_Util::cacheUnset('db_to_create');
PMA_Util::cacheUnset('dbs_where_create_table_allowed');
PMA_Util::cacheUnset('dbs_to_test');
PMA_Util::cacheUnset('db_priv');
PMA_Util::cacheUnset('col_priv');
PMA_Util::cacheUnset('table_priv');
PMA_Util::cacheUnset('proc_priv');
$GLOBALS['no_activity'] = true;
$this->authFails();
if (! defined('TESTSUITE')) {