From cc65688b3da3e16729a1f73dd50fd975bd1ff741 Mon Sep 17 00:00:00 2001
From: hellkat <hellkat@ispconfig3>
Date: Tue, 26 Mar 2013 00:43:51 -0400
Subject: [PATCH]     Merged revisions 3845-3876 and 3879-3918 from stable branch.

---
 interface/web/login/index.php |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/interface/web/login/index.php b/interface/web/login/index.php
index a158422..2c596f8 100644
--- a/interface/web/login/index.php
+++ b/interface/web/login/index.php
@@ -213,7 +213,7 @@
                                 // check if the user theme is valid
                                 if($_SESSION['s']['user']['theme'] != 'default') {
                                     $tmp_path = ISPC_THEMES_PATH."/".$_SESSION['s']['user']['theme'];
-                                    if(!@is_dir($tmp_path) || !@file_exists($tmp_path."/ISPC_VERSION") || trim(file_get_contents($tmp_path."/ISPC_VERSION")) != ISPC_APP_VERSION) {
+                                    if(!@is_dir($tmp_path) || !@file_exists($tmp_path."/ispconfig_version") || trim(file_get_contents($tmp_path."/ispconfig_version")) != ISPC_APP_VERSION) {
                                         // fall back to default theme if this one is not compatible with current ispc version
                                         $_SESSION['s']['user']['theme'] = 'default';
                                         $_SESSION['s']['theme'] = 'default';

--
Gitblit v1.9.1