summaryrefslogtreecommitdiffstats
path: root/usr/local/www/interfaces.php
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2011-06-03 15:34:54 -0400
committerjim-p <jimp@pfsense.org>2011-06-03 15:34:54 -0400
commit534375b6f0ad869022c068ef35c5c6dedcd619bd (patch)
tree7a756196aa5f720c2d4019bb1686e7ebd25bdc36 /usr/local/www/interfaces.php
parentee0cf21f7c71cc0d7630a0d607b1082424dc725b (diff)
parentbd4b09826c4f0a6ecae94c99a9fdfa8bf7bc4a95 (diff)
downloadpfsense-534375b6f0ad869022c068ef35c5c6dedcd619bd.zip
pfsense-534375b6f0ad869022c068ef35c5c6dedcd619bd.tar.gz
Merge remote branch 'upstream/master'
Conflicts: etc/inc/openvpn.inc
Diffstat (limited to 'usr/local/www/interfaces.php')
-rwxr-xr-xusr/local/www/interfaces.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index 0ecf1d3..41957c5 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -1311,6 +1311,7 @@ $types = array("none" => gettext("None"), "staticv4" => gettext("Static IPv4"),
if ($mediaopt_from_config == 'autoselect ' || $mediaopt_from_config == ' ') echo "style='display:none'>";
else echo '>';
echo '<select name="mediaopt" class="formselect" id="mediaopt">';
+ print "<option value=\"\">Default</option>";
foreach($mediaopts_list as $mediaopt){
if ($mediaopt != rtrim($mediaopt_from_config)){
print "<option value=\"$mediaopt\">" . gettext("$mediaopt") . "</option>";
OpenPOWER on IntegriCloud