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

fix theme changing

Browse Source
This commit is contained in:
Crack
2010-07-16 11:30:21 +02:00
parent 7a5fd62810
commit 995fcba961
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/Config.class.php
View File

@@ -459,7 +459,7 @@ class PMA_Config
$this->set('user_preferences', $_SESSION['cache'][$cache_key]['userprefs_type']); $this->set('user_preferences', $_SESSION['cache'][$cache_key]['userprefs_type']);
// backup some settings // backup some settings
$fontsize = $this->get('fontsize'); $org_fontsize = $this->settings['fontsize'];
// load config array // load config array
$this->settings = PMA_array_merge_recursive($this->settings, $config_data); $this->settings = PMA_array_merge_recursive($this->settings, $config_data);
$GLOBALS['cfg'] = PMA_array_merge_recursive($GLOBALS['cfg'], $config_data); $GLOBALS['cfg'] = PMA_array_merge_recursive($GLOBALS['cfg'], $config_data);
@@ -475,7 +475,9 @@ class PMA_Config
// load/save theme // load/save theme
// theme cookie exists only if we are using non-default theme // theme cookie exists only if we are using non-default theme
$tmanager = $_SESSION['PMA_Theme_Manager']; $tmanager = $_SESSION['PMA_Theme_Manager'];
if ($tmanager->getThemeCookie()) {
// save new theme
if ($tmanager->getThemeCookie() || isset($_REQUEST['set_theme'])) {
if (!isset($config_data['ThemeDefault']) if (!isset($config_data['ThemeDefault'])
|| $config_data['ThemeDefault'] != $tmanager->theme->getId()) { || $config_data['ThemeDefault'] != $tmanager->theme->getId()) {
// new theme was set in common.inc.php // new theme was set in common.inc.php
@@ -483,7 +485,7 @@ class PMA_Config
} }
} else { } else {
// no cookie - read default from settings // no cookie - read default from settings
if ($this->settings['ThemeDefault'] != $tmanager->theme if ($this->settings['ThemeDefault'] != $tmanager->theme->getId()
&& $tmanager->checkTheme($this->settings['ThemeDefault'])) { && $tmanager->checkTheme($this->settings['ThemeDefault'])) {
$tmanager->setActiveTheme($this->settings['ThemeDefault']); $tmanager->setActiveTheme($this->settings['ThemeDefault']);
$tmanager->setThemeCookie(); $tmanager->setThemeCookie();
@@ -491,8 +493,8 @@ class PMA_Config
} }
// save new font size // save new font size
if (!isset($config_data['fontsize']) || $fontsize != $config_data['fontsize']) { if (!isset($config_data['fontsize']) || $org_fontsize != $config_data['fontsize']) {
$this->setUserValue('pma_fontsize', 'fontsize', $fontsize, '82%'); $this->setUserValue('pma_fontsize', 'fontsize', $org_fontsize, '82%');
} }
} }