summaryrefslogtreecommitdiffstats
path: root/etc/inc
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2005-05-20 23:37:33 +0000
committerScott Ullrich <sullrich@pfsense.org>2005-05-20 23:37:33 +0000
commit5ee29b5120abb168b3b7f9fcd4ba4b5ff73ba663 (patch)
treeaabd3d3abd0625811bad8393811070a982b98d00 /etc/inc
parent85eb07c335201b395d68de80c1d5ca3b905fc967 (diff)
downloadpfsense-5ee29b5120abb168b3b7f9fcd4ba4b5ff73ba663.zip
pfsense-5ee29b5120abb168b3b7f9fcd4ba4b5ff73ba663.tar.gz
Do not use config.cache until the serialize() bug is solved.
Diffstat (limited to 'etc/inc')
-rw-r--r--etc/inc/config.inc7
1 files changed, 7 insertions, 0 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index 93643ef..d98d758 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -166,6 +166,7 @@ function parse_config($parse = false) {
global $g;
config_lock();
+ /*
if(!$parse) {
if(file_exists($g['tmp_path'] . '/config.cache')) {
$config = unserialize(file_get_contents($g['tmp_path'] . '/config.cache'));
@@ -181,6 +182,12 @@ function parse_config($parse = false) {
$config = parse_xml_config($g['conf_path'] . '/config.xml', $g['xml_rootobj']);
generate_config_cache($config);
}
+ */
+
+ /* ugly hack! config.cache is really borked. don't use until its fixed. */
+ $config = parse_xml_config($g['conf_path'] . '/config.xml', $g['xml_rootobj']);
+ generate_config_cache($config);
+
config_unlock();
return $config;
}
OpenPOWER on IntegriCloud