From 28ce6dbe802469071117b0632816f9cac924123c Mon Sep 17 00:00:00 2001 From: jim-p Date: Mon, 4 Feb 2013 11:21:56 -0500 Subject: Only update squid options if we have something to do, otherwise this can interfere with squid's default options in a new install if someone installs squidGuard without first configuring squid. --- config/squidGuard/squidguard_configurator.inc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'config/squidGuard') diff --git a/config/squidGuard/squidguard_configurator.inc b/config/squidGuard/squidguard_configurator.inc index 0100fba4..81f9cd96 100644 --- a/config/squidGuard/squidguard_configurator.inc +++ b/config/squidGuard/squidguard_configurator.inc @@ -443,8 +443,11 @@ function squid_reconfigure($remove_only = '') # update config if (is_array($conf)) $conf = implode(";", $conf); - $config['installedpackages']['squid']['config'][0]['custom_options'] = $conf; - write_config('Update redirector options to squid config.'); + /* Only update squid options if we have something to do, otherwise this can interfere with squid's default options in a new install. */ + if (!empty($conf)) { + $config['installedpackages']['squid']['config'][0]['custom_options'] = $conf; + write_config('Update redirector options to squid config.'); + } # resync squid package, if installed if (function_exists('squid_resync')) { -- cgit v1.2.3