Commit 4191a7d7 authored by Marius Burkard's avatar Marius Burkard
Browse files

Merge branch 'crit-error-custom-postfix' into 'develop'

Fix critical error with new custom Postfix config

See merge request ispconfig/ispconfig3!1440
parents 833c193e 3c5d2328
Pipeline #8038 passed with stage
in 13 seconds
......@@ -1177,7 +1177,7 @@ class installer_base {
}
$configfile = 'postfix_custom.conf';
if(file_exists($conf['ispconfig_install_dir'].'/server/conf-custom/install/' . $configfile . '.master')) {
$content = rfsel($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master');
$content = file_get_contents($conf['ispconfig_install_dir'].'/server/conf-custom/install/'.$configfile.'.master');
$content = strtr($content, $postconf_placeholders);
$postconf_commands = array_merge($postconf_commands, array_filter(explode("\n", $content)));
}
......
Supports Markdown
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