aboutsummaryrefslogtreecommitdiffstats
path: root/config/squid/squid.inc
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-09-11 16:59:41 -0300
committerRenato Botelho <renato@netgate.com>2015-09-11 16:59:41 -0300
commit0896906957daf716697508ee8a2e685e6e276e91 (patch)
treea1dafd60d2b0845b2a839d3d5eb483f18b3ad5fe /config/squid/squid.inc
parent94552b1db607bd973becb7eb8e0d3e32d9fd4b90 (diff)
parentfb2aaef04afcac0361317a519244013bb2b6b1be (diff)
downloadpfsense-packages-0896906957daf716697508ee8a2e685e6e276e91.tar.gz
pfsense-packages-0896906957daf716697508ee8a2e685e6e276e91.tar.bz2
pfsense-packages-0896906957daf716697508ee8a2e685e6e276e91.zip
Merge pull request #1060 from doktornotor/patch-7
Diffstat (limited to 'config/squid/squid.inc')
-rw-r--r--config/squid/squid.inc9
1 files changed, 7 insertions, 2 deletions
diff --git a/config/squid/squid.inc b/config/squid/squid.inc
index 27bff27b..5a0946bb 100644
--- a/config/squid/squid.inc
+++ b/config/squid/squid.inc
@@ -543,10 +543,15 @@ function squid_validate_auth($post, &$input_errors) {
}
function squid_install_cron($should_install) {
- global $config;
- if (platform_booting()) {
+ global $g, $config;
+ if (function_exists("platform_booting")) {
+ if (platform_booting()) {
+ return;
+ }
+ } elseif ($g['booting']) {
return;
}
+
parse_config(true);
if (is_array($config['installedpackages']['squidcache'])) {