From dd58fce29c9f556435f3861bf6aa1d551ceeee73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Thu, 21 Jan 2010 12:33:30 +0000 Subject: [PATCH] Fix more occurences of $_SESSION['PMA_Config']. --- libraries/Config.class.php | 2 +- themes/darkblue_orange/css/theme_right.css.php | 2 +- themes/original/css/theme_left.css.php | 2 +- themes/original/css/theme_right.css.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 5d5594735..0582ac9fe 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -554,7 +554,7 @@ class PMA_Config */ function getThemeUniqueValue() { - return intval((null !== $GLOBALS['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : (isset($_COOKIE['pma_fontsize']) ? $_COOKIE['pma_fontsize'] : 0))) + ($this->source_mtime + $this->default_source_mtime + $_SESSION['PMA_Theme']->mtime_info + $_SESSION['PMA_Theme']->filesize_info) . (isset($_SESSION['tmp_user_values']['custom_color']) ? substr($_SESSION['tmp_user_values']['custom_color'],1,6) : ''); + return intval((null !== $GLOBALS['PMA_Config']->get('fontsize') ? $GLOBALS['PMA_Config']->get('fontsize') : (isset($_COOKIE['pma_fontsize']) ? $_COOKIE['pma_fontsize'] : 0))) + ($this->source_mtime + $this->default_source_mtime + $_SESSION['PMA_Theme']->mtime_info + $_SESSION['PMA_Theme']->filesize_info) . (isset($_SESSION['tmp_user_values']['custom_color']) ? substr($_SESSION['tmp_user_values']['custom_color'],1,6) : ''); } /** diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php index adb37520a..7bc875f98 100644 --- a/themes/darkblue_orange/css/theme_right.css.php +++ b/themes/darkblue_orange/css/theme_right.css.php @@ -16,7 +16,7 @@ if (!defined('PMA_MINIMUM_COMMON')) { /******************************************************************************/ /* general tags */ html { - font-size: get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']); ?>; + font-size: get('fontsize') ? $GLOBALS['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']); ?>; } input, select, textarea { diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php index 5f7b318f6..d3d3f045e 100644 --- a/themes/original/css/theme_left.css.php +++ b/themes/original/css/theme_left.css.php @@ -16,7 +16,7 @@ if (!defined('PMA_MINIMUM_COMMON')) { /******************************************************************************/ /* general tags */ html { - font-size: get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']); ?>; + font-size: get('fontsize') ? $GLOBALS['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']); ?>; } input, select, textarea { diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index a83c73afa..a6eaf9492 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -16,7 +16,7 @@ if (!defined('PMA_MINIMUM_COMMON')) { /******************************************************************************/ /* general tags */ html { - font-size: get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : ( + font-size: get('fontsize') ? $GLOBALS['PMA_Config']->get('fontsize') : ( isset($_COOKIE['pma_fontsize']) ? $_COOKIE['pma_fontsize'] : '84%'));?>; }