diff --git a/install-dev/classes/session.php b/install-dev/classes/session.php index 3002ca3d6..67bbcf9ab 100644 --- a/install-dev/classes/session.php +++ b/install-dev/classes/session.php @@ -43,13 +43,17 @@ class InstallSession public function __construct() { session_name('install_'.md5(__PS_BASE_URI__)); - if (!session_start() + if (!($session_started = session_start()) || (!isset($_SESSION['session_mode']) && (isset($_POST['submitNext']) || isset($_POST['submitPrevious']) || isset($_POST['language'])))) { InstallSession::$_cookie_mode = true; InstallSession::$_cookie = new Cookie('ps_install', null, time() + 7200, null, true); } - $_SESSION['session_mode'] = 'session'; + if ($session_started && !isset($_SESSION['session_mode'])) + { + $_SESSION['session_mode'] = 'session'; + session_write_close(); + } } public function clean() diff --git a/install-dev/theme/view.css b/install-dev/theme/view.css index 3ecd4f8e8..592fab40a 100644 --- a/install-dev/theme/view.css +++ b/install-dev/theme/view.css @@ -43,12 +43,11 @@ a {cursor:pointer;} width:990px; background :#fff; } - #header { - padding:6px 16px 16px 16px; - height:68px;/* 90 */ - background:#394049; - } - +#header { + padding:6px 16px 16px 16px; + height:50px; + background:#394049; +} #loaderSpace{ display:none; z-index: 100; @@ -407,7 +406,7 @@ ul#footer a:link, ul#footer a:active, ul#footer a:visited { } .sheet .contentTitle { position:absolute; - top:90px; + top:72px; left:0; padding:15px 25px 10px 38px; height:28px;/* 53 */ diff --git a/install-dev/theme/views/header.phtml b/install-dev/theme/views/header.phtml index 43119205f..f5791de8c 100644 --- a/install-dev/theme/views/header.phtml +++ b/install-dev/theme/views/header.phtml @@ -39,11 +39,13 @@