diff options
| author | Ermal <eri@pfsense.org> | 2010-11-19 00:10:56 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2010-11-19 00:10:56 +0000 |
| commit | 1883455aad0e14cb063ec87562117b1a43214515 (patch) | |
| tree | 9e99eb0f75113a572a984e3aade91866823054bc | |
| parent | d8333a247a544a4d95d977ab3c324502fe037619 (diff) | |
| download | pfsense-1883455aad0e14cb063ec87562117b1a43214515.zip pfsense-1883455aad0e14cb063ec87562117b1a43214515.tar.gz | |
Hopefully now the reinclusion of config will not override vars.
| -rw-r--r-- | etc/inc/config.gui.inc | 6 | ||||
| -rw-r--r-- | etc/inc/config.inc | 2 | ||||
| -rw-r--r-- | etc/inc/globals.inc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/etc/inc/config.gui.inc b/etc/inc/config.gui.inc index eea6f33..3516e15 100644 --- a/etc/inc/config.gui.inc +++ b/etc/inc/config.gui.inc @@ -49,10 +49,10 @@ require_once("globals.inc"); /* do not load this file twice. */ -if($config_inc_loaded == true) +if($config_parsed == true) return; else - $config_inc_loaded = true; + $config_parsed = true; // Set the memory limit to 128M. When someone has something like 500+ tunnels // the parser needs quite a bit of ram. Do not remove this line unless you @@ -92,4 +92,4 @@ if($config_parsed == true) { } } -?>
\ No newline at end of file +?> diff --git a/etc/inc/config.inc b/etc/inc/config.inc index 724615a..d21c452 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -211,4 +211,4 @@ if($config_parsed == true) { } } -?>
\ No newline at end of file +?> diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index 3c28958..e9339cd 100644 --- a/etc/inc/globals.inc +++ b/etc/inc/globals.inc @@ -164,6 +164,6 @@ $sysctls = array("net.inet.ip.portrange.first" => "1024", "net.inet.icmp.icmplim" => "0" ); -$config_inc_loaded = false; +$config_parsed = false; ?> |
