diff --git a/ChangeLog b/ChangeLog
index fc59aeb60..943550d64 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-12-01 Sebastian Mendel <cybot_tm@users.sourceforge.net>
+    * libraries/common.lib.php, Theme.class.php:
+      missing '/' in img path (bug #1370437)
+
 2005-11-30 Michal Čihař  <michal@cihar.com>
     * lang/*: Messages for Sebastian.
     * libraries/Config.class.php: Actually load configuration.
diff --git a/libraries/Theme.class.php b/libraries/Theme.class.php
index a5217ea42..f0301c04c 100644
--- a/libraries/Theme.class.php
+++ b/libraries/Theme.class.php
@@ -33,6 +33,44 @@ class PMA_Theme {
      */
     var $types = array( 'left', 'right', 'print' );
 
+    /**
+     * @var integer last modification time for info file
+     */
+    var $mtime_info = 0;
+
+    function __wakeup() {
+        $this->loadInfo();
+        $this->checkImgPath();
+    }
+
+    function loadInfo() {
+        if ( ! file_exists( $this->getPath() . '/info.inc.php' ) ) {
+            return false;
+        }
+
+        if ( $this->mtime_info === filemtime( $this->getPath() . '/info.inc.php' ) ) {
+            return true;
+        }
+
+        @include( $this->getPath() . '/info.inc.php' );
+
+        // did it set correctly?
+        if ( ! isset( $theme_name ) ) {
+            return false;
+        }
+
+        $this->mtime_info = filemtime( $this->getPath() . '/info.inc.php' );
+
+        if ( isset( $theme_full_version ) ) {
+            $this->setVersion( $theme_full_version );
+        } elseif ( isset( $theme_generation, $theme_version ) ) {
+            $this->setVersion( $theme_generation . '.' . $theme_version );
+        }
+        $this->setName( $theme_name );
+
+        return true;
+    }
+
     /**
      * returns theme object loaded from given folder
      * or false if theme is invalid
@@ -42,43 +80,35 @@ class PMA_Theme {
      * @return  object  PMA_Theme
      */
     function load( $folder ) {
-        if ( ! file_exists( $folder . '/info.inc.php' ) ) {
-            return false;
-        }
-
-        @include( $folder . '/info.inc.php' );
-
-        // did it set correctly?
-        if ( ! isset( $theme_name ) ) {
-            return false;
-        }
 
         $theme = new PMA_Theme();
 
         $theme->setPath( $folder );
 
-        if ( isset( $theme_full_version ) ) {
-            $theme->setVersion( $theme_full_version );
-        } elseif ( isset( $theme_generation, $theme_version ) ) {
-            $theme->setVersion( $theme_generation . '.' . $theme_version );
-        }
-        $theme->setName( $theme_name );
+        $theme->loadInfo();
 
-        if ( is_dir( $theme->getPath() . 'img/' ) ) {
-            $theme->setImgPath( $theme->getPath() . 'img/' );
-        } elseif ( is_dir( $GLOBALS['cfg']['ThemePath'] . '/original/img/' ) ) {
-            $theme->setImgPath( $GLOBALS['cfg']['ThemePath'] . '/original/img/' );
-        } else {
-            $GLOBALS['PMA_errors'][] =
-                sprintf( $GLOBALS['strThemeNoValidImgPath'], $theme_name );
-            trigger_error(
-                sprintf( $GLOBALS['strThemeNoValidImgPath'], $theme_name ),
-                E_USER_WARNING );
-        }
+        $theme->checkImgPath();
 
         return $theme;
     }
 
+    function checkImgPath() {
+        if ( is_dir( $this->getPath() . '/img/' ) ) {
+            $this->setImgPath( $this->getPath() . '/img/' );
+            return true;
+        } elseif ( is_dir( $GLOBALS['cfg']['ThemePath'] . '/original/img/' ) ) {
+            $this->setImgPath( $GLOBALS['cfg']['ThemePath'] . '/original/img/' );
+            return true;
+        } else {
+            $GLOBALS['PMA_errors'][] =
+                sprintf( $GLOBALS['strThemeNoValidImgPath'], $this->getName() );
+            trigger_error(
+                sprintf( $GLOBALS['strThemeNoValidImgPath'], $this->getName() ),
+                E_USER_WARNING );
+            return false;
+        }
+    }
+
     /**
      * returns path to theme
      * @uses    $this->$path    as return value
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index ef8b2332d..3ce453c99 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2588,6 +2588,9 @@ if ( isset( $_REQUEST['set_theme'] ) ) {
 }
 
 $_SESSION['PMA_Theme'] = $_SESSION['PMA_Theme_Manager']->theme;
+if ( version_compare( phpversion(), '5', 'lt' ) ) {
+    $_SESSION['PMA_Theme']->__wakeup();
+}
 
 // BC
 $GLOBALS['theme']           = $_SESSION['PMA_Theme']->getName();
@@ -2597,8 +2600,8 @@ $GLOBALS['pmaThemeImage']   = $_SESSION['PMA_Theme']->getImgPath();
 /**
  * load layout file if exists
  */
-if ( @file_exists( $GLOBALS['pmaThemePath'] . '/layout.inc.php' ) ) {
-    include( $GLOBALS['pmaThemePath'] . '/layout.inc.php' );
+if ( @file_exists( $_SESSION['PMA_Theme']->getLayoutFile() ) ) {
+    include( $_SESSION['PMA_Theme']->getLayoutFile() );
 }
 
 if ( ! defined( 'PMA_MINIMUM_COMMON' ) ) {