diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-09-22 14:57:50 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-09-22 14:57:50 +0000 |
| commit | c0b33b5b433eaa60f23d4aecb62bfe2ca26b6ba2 (patch) | |
| tree | 22a62b7c189aaddce3bbec56696fb4946c47bc78 /etc | |
| parent | 09c5f84041955d1817b2ff3eb759018f23f33a1b (diff) | |
| download | pfsense-c0b33b5b433eaa60f23d4aecb62bfe2ca26b6ba2.zip pfsense-c0b33b5b433eaa60f23d4aecb62bfe2ca26b6ba2.tar.gz | |
Global $g
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/filter.inc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 11438c2..db32124 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -2335,10 +2335,11 @@ function process_carp_rules() { function carp_sync_xml($url, $password, $section, $section_xml, $method = 'pfsense.restore_config_section', $port) { + global $config, $g; + if($g['booting']) return; - global $config; $params = array(new XML_RPC_Value($password, 'string'), new XML_RPC_Value($section, 'array'), new XML_RPC_Value($section_xml, 'array')); @@ -2360,11 +2361,11 @@ function carp_sync_xml($url, $password, $section, $section_xml, $method = 'pfsen function carp_sync_client() { + global $config, $g; + if($g['booting']) return; - global $config; - if($config['installedpackages']['carpsettings']['config'] != "" and is_array($config['installedpackages']['carpsettings']['config'])) { $already_processed = 1; |
