diff options
| author | Erik Fonnesbeck <efonnes@gmail.com> | 2010-04-28 21:17:27 -0600 |
|---|---|---|
| committer | Erik Fonnesbeck <efonnes@gmail.com> | 2010-04-28 21:17:27 -0600 |
| commit | c3c2fd205b1563976a278bd11396d055d7818d27 (patch) | |
| tree | ae0316ca6b0c8423c35fe22cfa1e8bcaf30cdd55 /usr/local/www/system_advanced_firewall.php | |
| parent | 39c0be7b5f387dffa7cbbb3dff3f2be46e6b504f (diff) | |
| parent | 1364604bb503b02e80240bda728e154394271b9c (diff) | |
| download | pfsense-c3c2fd205b1563976a278bd11396d055d7818d27.zip pfsense-c3c2fd205b1563976a278bd11396d055d7818d27.tar.gz | |
Merge branch 'master' into gettext
Resolved conflicts:
usr/local/www/system_advanced_firewall.php
usr/local/www/system_routes.php
usr/local/www/system_routes_edit.php
Diffstat (limited to 'usr/local/www/system_advanced_firewall.php')
| -rw-r--r-- | usr/local/www/system_advanced_firewall.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/local/www/system_advanced_firewall.php b/usr/local/www/system_advanced_firewall.php index a4c17e7..81a4b6b 100644 --- a/usr/local/www/system_advanced_firewall.php +++ b/usr/local/www/system_advanced_firewall.php @@ -59,6 +59,7 @@ $pconfig['disablenatreflection'] = $config['system']['disablenatreflection']; $pconfig['reflectiontimeout'] = $config['system']['reflectiontimeout']; $pconfig['bypassstaticroutes'] = isset($config['filter']['bypassstaticroutes']); $pconfig['disablescrub'] = isset($config['system']['disablescrub']); +$pconfig['tftpinterface'] = $config['system']['tftpinterface']; if ($_POST) { @@ -321,7 +322,7 @@ function update_description(itemnum) { <option value="<?=$ifent;?>" <?php if (stristr($pconfig['tftpinterface'], $ifent)) echo "selected"; ?>><?=gettext($ifdesc);?></option> <?php endforeach; ?> </select> - <strong><?=gettext("Choose the interfaces where you want TFTP proxy help to be enabled.");?></strong> + <strong><?=gettext("Choose the interfaces where you want TFTP proxy helper to be enabled.");?></strong> </td> </tr> <tr> |
