diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-03 12:53:57 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-03 12:53:57 -0300 |
| commit | 5f4fda7e8347ca44e6a8bb367c4f3b53cf556e3b (patch) | |
| tree | 009b8f964e36675fe3f5f6365da578bad7e9e6c8 /usr/local/www/interfaces_gre_edit.php | |
| parent | 4daa45d861ab448da4fdc910619a4ab6b213bc50 (diff) | |
| parent | fbe58e0a3dde0867d5aa0d5d0885d538a67e747d (diff) | |
| download | pfsense-5f4fda7e8347ca44e6a8bb367c4f3b53cf556e3b.zip pfsense-5f4fda7e8347ca44e6a8bb367c4f3b53cf556e3b.tar.gz | |
Merge remote branch 'mainline/master' into 4_load_balancer_and_services
Conflicts:
usr/local/www/interfaces.php
usr/local/www/interfaces_assign.php
usr/local/www/interfaces_bridge_edit.php
usr/local/www/interfaces_gif_edit.php
usr/local/www/interfaces_gre.php
usr/local/www/interfaces_groups.php
usr/local/www/interfaces_groups_edit.php
usr/local/www/interfaces_lagg.php
usr/local/www/interfaces_lagg_edit.php
usr/local/www/interfaces_ppps.php
usr/local/www/interfaces_ppps_edit.php
usr/local/www/interfaces_qinq.php
usr/local/www/interfaces_vlan.php
usr/local/www/interfaces_vlan_edit.php
usr/local/www/interfaces_wireless.php
usr/local/www/interfaces_wireless_edit.php
Diffstat (limited to 'usr/local/www/interfaces_gre_edit.php')
| -rw-r--r-- | usr/local/www/interfaces_gre_edit.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/local/www/interfaces_gre_edit.php b/usr/local/www/interfaces_gre_edit.php index 1144bcd..a59affc 100644 --- a/usr/local/www/interfaces_gre_edit.php +++ b/usr/local/www/interfaces_gre_edit.php @@ -39,6 +39,7 @@ ##|-PRIV require("guiconfig.inc"); +require_once("functions.inc"); if (!is_array($config['gres']['gre'])) $config['gres']['gre'] = array(); @@ -76,7 +77,7 @@ if ($_POST) { if ((!is_ipaddr($_POST['tunnel-local-addr'])) || (!is_ipaddr($_POST['tunnel-remote-addr'])) || (!is_ipaddr($_POST['remote-addr']))) { - $input_errors[] = "The tunnel local and tunnel remote fields must have valid IP addresses."; + $input_errors[] = gettext("The tunnel local and tunnel remote fields must have valid IP addresses."); } foreach ($a_gres as $gre) { |
