From 8fef0686cf910cfaf130e6a21ff061a74006b6eb Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Tue, 24 May 2005 10:37:38 +0000
Subject: [PATCH] bug #1207395, undefined theme_generation, theme_version

---
 ChangeLog                | 4 ++++
 libraries/common.lib.php | 9 ++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index afa313f2f..cb2109a93 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $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>
     * libraries/charset_conversion.lib.php: diacritics wrongly converted 
       in Browse mode under MySQL 4.1.x if AllowAnywhereRecoding set to TRUE
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index f7d72ee04..9029a9e28 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -361,14 +361,13 @@ unset($theme_name, $theme_generation, $theme_version);
 @include($cfg['ThemePath'] . '/' . $GLOBALS['theme'] . '/info.inc.php');
 
 // 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
-
-if ($theme_generation != PMA_THEME_GENERATION)
+} elseif ($theme_generation != PMA_THEME_GENERATION) {
     $GLOBALS['theme'] = 'original'; // different generation
-
-if ($theme_version < PMA_THEME_VERSION)
+} elseif ($theme_version < PMA_THEME_VERSION) {
     $GLOBALS['theme'] = 'original'; // too old version
+}
 
 $pmaThemeImage  = $cfg['ThemePath'] . '/' . $GLOBALS['theme'] . '/img/';
 $tmp_layout_file = $cfg['ThemePath'] . '/' . $GLOBALS['theme'] . '/layout.inc.php';