summaryrefslogtreecommitdiffstats
path: root/etc/inc/config.inc
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2010-05-18 19:27:57 +0000
committerErmal <eri@pfsense.org>2010-05-18 19:31:28 +0000
commite490f9950c965a878481dc830e99330fdb82837b (patch)
tree52bfec3c6fdf8f682057cc16055fc6f42e7f9141 /etc/inc/config.inc
parent873b2f0c810b15dc649c2ce71a08a56f01e649a4 (diff)
downloadpfsense-e490f9950c965a878481dc830e99330fdb82837b.zip
pfsense-e490f9950c965a878481dc830e99330fdb82837b.tar.gz
Do not bail out when we write a new config. Seems that we can write some special characters but might not be able to read them back but we still should be able to recover from this. Include globals.inc before calling any config.lib.inc functions.
Diffstat (limited to 'etc/inc/config.inc')
-rw-r--r--etc/inc/config.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index 1dd0d9a..5ec98be 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -54,10 +54,10 @@ if($g['booting']) echo ".";
ini_set("memory_limit","128M");
/* include globals from notices.inc /utility/XML parser files */
-require_once('config.lib.inc');
-if($g['booting']) echo ".";
require_once("notices.inc");
if($g['booting']) echo ".";
+require_once('config.lib.inc');
+if($g['booting']) echo ".";
require_once("util.inc");
if($g['booting']) echo ".";
if(file_exists("/cf/conf/use_xmlreader"))
OpenPOWER on IntegriCloud