Commit f598b053 authored by tbrehm's avatar tbrehm

Fixed: FS#2378 - $conf['theme'] value in interface/lib/config.inc.php is...

Fixed: FS#2378 - $conf['theme'] value in interface/lib/config.inc.php is overwritten (reset to 'default') on update
parent 013ae4df
......@@ -742,6 +742,7 @@ class installer_dist extends installer_base {
$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
$content = str_replace('{language}', $conf['language'], $content);
$content = str_replace('{timezone}', $conf['timezone'], $content);
$content = str_replace('{theme}', $conf['theme'], $content)
wf("$install_dir/interface/lib/$configfile", $content);
......@@ -765,6 +766,7 @@ class installer_dist extends installer_base {
$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
$content = str_replace('{language}', $conf['language'], $content);
$content = str_replace('{timezone}', $conf['timezone'], $content);
$content = str_replace('{theme}', $conf['theme'], $content)
wf("$install_dir/server/lib/$configfile", $content);
......
......@@ -740,6 +740,7 @@ class installer extends installer_base
$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
$content = str_replace('{language}', $conf['language'], $content);
$content = str_replace('{timezone}', $conf['timezone'], $content);
$content = str_replace('{theme}', $conf['theme'], $content)
$this->write_config_file("$install_dir/interface/lib/$configfile", $content);
......
......@@ -782,6 +782,7 @@ class installer_dist extends installer_base {
$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
$content = str_replace('{language}', $conf['language'], $content);
$content = str_replace('{timezone}', $conf['timezone'], $content);
$content = str_replace('{theme}', $conf['theme'], $content)
wf("$install_dir/interface/lib/$configfile", $content);
......@@ -805,6 +806,7 @@ class installer_dist extends installer_base {
$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
$content = str_replace('{language}', $conf['language'], $content);
$content = str_replace('{timezone}', $conf['timezone'], $content);
$content = str_replace('{theme}', $conf['theme'], $content)
wf("$install_dir/server/lib/$configfile", $content);
......
......@@ -109,6 +109,9 @@ exec('date +%Z', $tmp_out);
$conf['timezone'] = $tmp_out[0];
unset($tmp_out);
//* Set defaukt theme
$conf['theme'] = 'default';
//** Select installation mode
$install_mode = $inst->simple_query('Installation mode', array('standard','expert'), 'standard');
......
......@@ -1650,6 +1650,7 @@ class installer_base {
$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
$content = str_replace('{language}', $conf['language'], $content);
$content = str_replace('{timezone}', $conf['timezone'], $content);
$content = str_replace('{theme}', $conf['theme'], $content);
wf($install_dir.'/interface/lib/'.$configfile, $content);
......@@ -1673,6 +1674,7 @@ class installer_base {
$content = str_replace('{ispconfig_log_priority}', $conf['ispconfig_log_priority'], $content);
$content = str_replace('{language}', $conf['language'], $content);
$content = str_replace('{timezone}', $conf['timezone'], $content);
$content = str_replace('{theme}', $conf['theme'], $content);
wf($install_dir.'/server/lib/'.$configfile, $content);
......
......@@ -144,7 +144,7 @@ $conf['software_updates_enabled'] = false;
//** Themes
$conf['theme'] = 'default';
$conf['theme'] = '{theme}';
$conf['html_content_encoding'] = 'utf-8'; // example: utf-8, iso-8859-1, ...
$conf['logo'] = 'themes/default/images/header_logo.png';
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment