From 4bd960b10d9f32cb8a82a0718caaa005768c107c Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 24 Oct 2012 06:07:53 -0400
Subject: [PATCH] Merged revisions 3557-3594 from 3.0.5 stable branch.
---
interface/web/tools/interface_settings.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/interface/web/tools/interface_settings.php b/interface/web/tools/interface_settings.php
index 0744c73..0c17ac9 100644
--- a/interface/web/tools/interface_settings.php
+++ b/interface/web/tools/interface_settings.php
@@ -104,7 +104,7 @@
if($this->dataRecord['app_theme'] != 'default') {
$tmp_path = ISPC_THEMES_PATH."/".$this->dataRecord['app_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
$this->dataRecord['app_theme'] = 'default';
}
--
Gitblit v1.9.1