From ef21bd53b783203dd49e835577030d60b22e2af7 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 18 Oct 2012 11:55:59 -0400
Subject: [PATCH] Fixed theme settings
---
interface/web/themes/default_no_navimg/ispconfig_version | 1 +
interface/web/tools/interface_settings.php | 2 +-
interface/web/themes/default_combobox/ispconfig_version | 1 +
interface/web/themes/default_64_navimg/ispconfig_version | 1 +
4 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/interface/web/themes/default_64_navimg/ispconfig_version b/interface/web/themes/default_64_navimg/ispconfig_version
new file mode 100644
index 0000000..bb19ac3
--- /dev/null
+++ b/interface/web/themes/default_64_navimg/ispconfig_version
@@ -0,0 +1 @@
+3.0.4.6
\ No newline at end of file
diff --git a/interface/web/themes/default_combobox/ispconfig_version b/interface/web/themes/default_combobox/ispconfig_version
new file mode 100644
index 0000000..bb19ac3
--- /dev/null
+++ b/interface/web/themes/default_combobox/ispconfig_version
@@ -0,0 +1 @@
+3.0.4.6
\ No newline at end of file
diff --git a/interface/web/themes/default_no_navimg/ispconfig_version b/interface/web/themes/default_no_navimg/ispconfig_version
new file mode 100644
index 0000000..bb19ac3
--- /dev/null
+++ b/interface/web/themes/default_no_navimg/ispconfig_version
@@ -0,0 +1 @@
+3.0.4.6
\ No newline at end of file
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