diff options
| author | gnhb <gnoahb@gmail.com> | 2010-05-29 10:11:33 +0700 |
|---|---|---|
| committer | gnhb <gnoahb@gmail.com> | 2010-05-29 10:11:33 +0700 |
| commit | 68f0c07a0adab08b3fba2bc6749215e10d4d43ce (patch) | |
| tree | 4c698cbfdbae5b2f37f6cb8f6051efde92cba840 /usr/local/www/interfaces_gre.php | |
| parent | d6366dd7beefba982c1e04a1f43f20cfe306808a (diff) | |
| parent | 40e18a72af0d2633251ef197ff6311325ce4eae9 (diff) | |
| download | pfsense-68f0c07a0adab08b3fba2bc6749215e10d4d43ce.zip pfsense-68f0c07a0adab08b3fba2bc6749215e10d4d43ce.tar.gz | |
Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mainline into mlppp
Conflicts:
etc/inc/pfsense-utils.inc
usr/local/www/interfaces.php
Diffstat (limited to 'usr/local/www/interfaces_gre.php')
| -rw-r--r-- | usr/local/www/interfaces_gre.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/local/www/interfaces_gre.php b/usr/local/www/interfaces_gre.php index 17b14fe..a1a959e 100644 --- a/usr/local/www/interfaces_gre.php +++ b/usr/local/www/interfaces_gre.php @@ -111,7 +111,7 @@ include("head.inc"); <?php $i = 0; foreach ($a_gres as $gre): ?> <tr ondblclick="document.location='interfaces_vlan_gre.php?id=<?=$i;?>'"> <td class="listlr"> - <?=htmlspecialchars($gre['if']);?> + <?=htmlspecialchars(convert_friendly_interface_to_friendly_descr($gre['if']));?> </td> <td class="listr"> <?=htmlspecialchars($gre['remote-addr']);?> |
