diff options
| author | jim-p <jimp@pfsense.org> | 2013-04-05 10:28:51 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2013-04-05 10:28:51 -0400 |
| commit | 4d403ac400fe20c4e70c4fd5cffd72e7c1287d65 (patch) | |
| tree | 7a0d2803b31294f01a518a26ac62f2f3657d2e0b /config | |
| parent | b5bf49e168925bbb901471de3e389b6d8cb2ad5c (diff) | |
| download | pfsense-packages-4d403ac400fe20c4e70c4fd5cffd72e7c1287d65.tar.gz pfsense-packages-4d403ac400fe20c4e70c4fd5cffd72e7c1287d65.tar.bz2 pfsense-packages-4d403ac400fe20c4e70c4fd5cffd72e7c1287d65.zip | |
Fix this test so it will also remove squidGuard's options from squid config when disabling.
Diffstat (limited to 'config')
| -rw-r--r-- | config/squidGuard/squidguard_configurator.inc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/config/squidGuard/squidguard_configurator.inc b/config/squidGuard/squidguard_configurator.inc index 81f9cd96..e57b7597 100644 --- a/config/squidGuard/squidguard_configurator.inc +++ b/config/squidGuard/squidguard_configurator.inc @@ -414,7 +414,6 @@ function squid_reconfigure($remove_only = '') global $squidguard_config; $conf = ''; $cust_opt = $config['installedpackages']['squid']['config'][0]['custom_options']; - # remove old options if (!empty($cust_opt)) { $conf = explode(";", $cust_opt); @@ -444,7 +443,7 @@ function squid_reconfigure($remove_only = '') if (is_array($conf)) $conf = implode(";", $conf); /* 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)) { + if ($conf != $cust_opt) { $config['installedpackages']['squid']['config'][0]['custom_options'] = $conf; write_config('Update redirector options to squid config.'); } |