diff options
| author | Stephane Lapie <stephane.lapie@asahinet.com> | 2014-06-23 23:41:59 +0900 |
|---|---|---|
| committer | Stephane Lapie <stephane.lapie@asahinet.com> | 2014-06-23 23:41:59 +0900 |
| commit | ec079fc18a1289be2676fa57c15829b20cb4a912 (patch) | |
| tree | 658ebfeb07d9ead4fb5c8d86d723a94819d02511 /config/squid | |
| parent | ab69db91000fd3d83bf86811ede117062f57f438 (diff) | |
| parent | 5b4c84c4ecc9a6eded4ce3443a665eae2c8a43f9 (diff) | |
| download | pfsense-packages-ec079fc18a1289be2676fa57c15829b20cb4a912.tar.gz pfsense-packages-ec079fc18a1289be2676fa57c15829b20cb4a912.tar.bz2 pfsense-packages-ec079fc18a1289be2676fa57c15829b20cb4a912.zip | |
Merge https://github.com/pfsense/pfsense-packages
Conflicts:
pkg_config.10.xml
pkg_config.8.xml
pkg_config.8.xml.amd64
Diffstat (limited to 'config/squid')
| -rw-r--r-- | config/squid/squid.inc | 2 | ||||
| -rw-r--r-- | config/squid/squid.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/squid/squid.inc b/config/squid/squid.inc index 9f7fe2b0..0ddd1645 100644 --- a/config/squid/squid.inc +++ b/config/squid/squid.inc @@ -278,7 +278,7 @@ function squid_deinstall_command() { filter_configure(); } -function squid_before_form_general($pkg) { +function squid_before_form_general(&$pkg) { $values = get_dir(SQUID_CONFBASE . '/errors/'); // Get rid of '..' and '.' array_shift($values); diff --git a/config/squid/squid.xml b/config/squid/squid.xml index 88bd94ec..67956229 100644 --- a/config/squid/squid.xml +++ b/config/squid/squid.xml @@ -320,7 +320,7 @@ </field> </fields> <custom_php_command_before_form> - squid_before_form_general(&$pkg); + squid_before_form_general($pkg); </custom_php_command_before_form> <custom_add_php_command> squid_resync(); |