aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2010-04-27 23:06:06 -0400
committerScott Ullrich <sullrich@pfsense.org>2010-04-27 23:06:06 -0400
commit697dc68cb029edf695cb158bc86c8318d57b1f79 (patch)
tree3863c6c1ff14e9d0636591120e2e3d7772446a90
parentc6cf3ca685725a448d00ee096c6f61043492bf81 (diff)
downloadpfsense-packages-697dc68cb029edf695cb158bc86c8318d57b1f79.tar.gz
pfsense-packages-697dc68cb029edf695cb158bc86c8318d57b1f79.tar.bz2
pfsense-packages-697dc68cb029edf695cb158bc86c8318d57b1f79.zip
Make globals uniform
-rw-r--r--config/varnish64/varnish.inc6
1 files changed, 3 insertions, 3 deletions
diff --git a/config/varnish64/varnish.inc b/config/varnish64/varnish.inc
index 042db490..27e26adf 100644
--- a/config/varnish64/varnish.inc
+++ b/config/varnish64/varnish.inc
@@ -86,7 +86,7 @@ function varnish_start() {
/* Return true if a backend is in use */
function is_varnish_backend_in_use($backendname) {
- global $g, $config;
+ global $config, $g;
if($config['installedpackages']['varnishlbdirectors']['config'] != "")
foreach($config['installedpackages']['varnishlbdirectors']['config'] as $url)
foreach($url['row'] as $urlmapping)
@@ -144,7 +144,7 @@ EOAU;
}
function create_varnish_rcd_file() {
- global $g, $config;
+ global $config, $g;
if($config['installedpackages']['varnishsettings']['config'] != "") {
foreach($config['installedpackages']['varnishsettings']['config'] as $vs) {
if($vs['storagetype'] == "malloc")
@@ -416,7 +416,7 @@ EOF;
/* Uses XMLRPC to synchronize the changes to a remote node */
function varnish_sync_on_changes() {
- global $g, $config;
+ global $config, $g;
log_error("[varnish] varnish_xmlrpc_sync.php is starting.");
$synconchanges = $config['installedpackages']['varnishsync']['config'][0]['synconchanges'];
if(!$synconchanges)