webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-29 21:24:44 +03:00
Code Activity

Merge branch 'QA_4_6'

Browse Source
This commit is contained in:
Michal Čihař
2016-12-13 10:54:59 +01:00
parent 91dd60e6ad 8d5939348e
commit 8ef66ace36
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/Util.php
View File

@@ -2790,7 +2790,7 @@ class Util
*/
public static function cacheExists($var)
{
return isset($_SESSION['cache']['server_' . $GLOBALS['server']][$var]);
return isset($_SESSION['cache']['server_' . $GLOBALS['server'] . '_' . $GLOBALS['cfg']['Server']['user']][$var]);
}
/**
@@ -2804,7 +2804,7 @@ class Util
public static function cacheGet($var, $callback = null)
{
if (self::cacheExists($var)) {
return $_SESSION['cache']['server_' . $GLOBALS['server']][$var];
return $_SESSION['cache']['server_' . $GLOBALS['server'] . '_' . $GLOBALS['cfg']['Server']['user']][$var];
} else {
if ($callback) {
$val = $callback();
@@ -2825,7 +2825,7 @@ class Util
*/
public static function cacheSet($var, $val = null)
{
$_SESSION['cache']['server_' . $GLOBALS['server']][$var] = $val;
$_SESSION['cache']['server_' . $GLOBALS['server'] . '_' . $GLOBALS['cfg']['Server']['user']][$var] = $val;
}
/**
@@ -2837,7 +2837,7 @@ class Util
*/
public static function cacheUnset($var)
{
unset($_SESSION['cache']['server_' . $GLOBALS['server']][$var]);
unset($_SESSION['cache']['server_' . $GLOBALS['server'] . '_' . $GLOBALS['cfg']['Server']['user']][$var]);
}
/**