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

bug #1542865, themes not switching

Browse Source
This commit is contained in:
Marc Delisle
2006-08-30 21:55:59 +00:00
parent 081e4be128
commit 8cf7947219
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - ChangeLog
$Id$ $Id$
$Source$ $Source$
2006-08-30 Marc Delisle <lem9@users.sourceforge.net>
* libraries/common.lib.php: bug #1542865, themes not switching
when ThemePerServer is true
2006-08-30 Michal Čihař <michal@cihar.com> 2006-08-30 Michal Čihař <michal@cihar.com>
* libraries/common.lib.php, lang/*: Internationalise link to MySQL * libraries/common.lib.php, lang/*: Internationalise link to MySQL
documentation when translation exists, this needs to be defined in documentation when translation exists, this needs to be defined in

13
libraries/common.lib.php
View File

@@ -3074,8 +3074,18 @@ if (! isset($_SESSION['PMA_Theme_Manager'])) {
$_SESSION['PMA_Theme_Manager']->checkConfig(); $_SESSION['PMA_Theme_Manager']->checkConfig();
} }
// for the theme per server feature
if (isset($_REQUEST['server']) && !isset($_REQUEST['set_theme'])) {
$GLOBALS['server'] = $_REQUEST['server'];
$tmp = $_SESSION['PMA_Theme_Manager']->getThemeCookie();
if (empty($tmp)) {
$tmp = $_SESSION['PMA_Theme_Manager']->theme_default;
}
$_SESSION['PMA_Theme_Manager']->setActiveTheme($tmp);
unset($tmp);
}
if (isset($_REQUEST['set_theme'])) { if (isset($_REQUEST['set_theme'])) {
// if user submit a theme // if user selected a theme
$_SESSION['PMA_Theme_Manager']->setActiveTheme($_REQUEST['set_theme']); $_SESSION['PMA_Theme_Manager']->setActiveTheme($_REQUEST['set_theme']);
} }
@@ -3362,7 +3372,6 @@ if (! defined('PMA_MINIMUM_COMMON')) {
PMA_setCookie('pma_collation_connection', $GLOBALS['collation_connection']); PMA_setCookie('pma_collation_connection', $GLOBALS['collation_connection']);
$_SESSION['PMA_Theme_Manager']->setThemeCookie(); $_SESSION['PMA_Theme_Manager']->setThemeCookie();
} // end if !defined('PMA_MINIMUM_COMMON') } // end if !defined('PMA_MINIMUM_COMMON')
if (!empty($__redirect) && in_array($__redirect, $goto_whitelist)) { if (!empty($__redirect) && in_array($__redirect, $goto_whitelist)) {