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

bug #1207395, undefined theme_generation, theme_version

Browse Source
This commit is contained in:
Marc Delisle
2005-05-24 10:37:38 +00:00
parent 604411e2b3
commit 8fef0686cf
2 changed files with 8 additions and 5 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$
2005-05-24 Marc Delisle <lem9@users.sourceforge.net>
* libraries/common.lib.php: bug #1207395, undefined theme_generation
and theme_version, thanks to Ryan Schmidt
2005-05-22 Marc Delisle <lem9@users.sourceforge.net> 2005-05-22 Marc Delisle <lem9@users.sourceforge.net>
* libraries/charset_conversion.lib.php: diacritics wrongly converted * libraries/charset_conversion.lib.php: diacritics wrongly converted
in Browse mode under MySQL 4.1.x if AllowAnywhereRecoding set to TRUE in Browse mode under MySQL 4.1.x if AllowAnywhereRecoding set to TRUE

9
libraries/common.lib.php
View File

@@ -361,14 +361,13 @@ unset($theme_name, $theme_generation, $theme_version);
@include($cfg['ThemePath'] . '/' . $GLOBALS['theme'] . '/info.inc.php'); @include($cfg['ThemePath'] . '/' . $GLOBALS['theme'] . '/info.inc.php');
// did it set correctly? // did it set correctly?
if (!isset($theme_name, $theme_generation, $theme_version)) if (!isset($theme_name, $theme_generation, $theme_version)) {
$GLOBALS['theme'] = 'original'; // invalid theme $GLOBALS['theme'] = 'original'; // invalid theme
} elseif ($theme_generation != PMA_THEME_GENERATION) {
if ($theme_generation != PMA_THEME_GENERATION)
$GLOBALS['theme'] = 'original'; // different generation $GLOBALS['theme'] = 'original'; // different generation
} elseif ($theme_version < PMA_THEME_VERSION) {
if ($theme_version < PMA_THEME_VERSION)
$GLOBALS['theme'] = 'original'; // too old version $GLOBALS['theme'] = 'original'; // too old version
}
$pmaThemeImage = $cfg['ThemePath'] . '/' . $GLOBALS['theme'] . '/img/'; $pmaThemeImage = $cfg['ThemePath'] . '/' . $GLOBALS['theme'] . '/img/';
$tmp_layout_file = $cfg['ThemePath'] . '/' . $GLOBALS['theme'] . '/layout.inc.php'; $tmp_layout_file = $cfg['ThemePath'] . '/' . $GLOBALS['theme'] . '/layout.inc.php';