diff options
| author | Seth Mos <seth.mos@dds.nl> | 2010-12-20 21:06:33 +0100 |
|---|---|---|
| committer | Seth Mos <seth.mos@dds.nl> | 2010-12-20 21:06:33 +0100 |
| commit | 81afb50916235853a9b3046796199a443d27c224 (patch) | |
| tree | f25e1acd56748f178699a1edc33c123bd2182f20 /etc/inc/config.gui.inc | |
| parent | 172007f50c215acf458340773a32052c28556aaa (diff) | |
| parent | 49659e1cc6f78af1287590fca7b64791fd6da6f1 (diff) | |
| download | pfsense-81afb50916235853a9b3046796199a443d27c224.zip pfsense-81afb50916235853a9b3046796199a443d27c224.tar.gz | |
Merge remote branch 'upstream/master'
Conflicts:
etc/inc/interfaces.inc
etc/inc/vslb.inc
usr/local/www/interfaces.php
Diffstat (limited to 'etc/inc/config.gui.inc')
| -rw-r--r-- | etc/inc/config.gui.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/inc/config.gui.inc b/etc/inc/config.gui.inc index b41073f..dda13cc 100644 --- a/etc/inc/config.gui.inc +++ b/etc/inc/config.gui.inc @@ -38,7 +38,7 @@ POSSIBILITY OF SUCH DAMAGE. - pfSense_BUILDER_BINARIES: /sbin/mount /sbin/sysctl /sbin/umount /sbin/halt /sbin/fsck /bin/sync + pfSense_BUILDER_BINARIES: /sbin/mount /sbin/sysctl /sbin/umount /sbin/halt /sbin/fsck pfSense_MODULE: config */ /* @@ -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 |
