From 98de735fc0998125553039274d0cbeeccf01eb82 Mon Sep 17 00:00:00 2001
From: Chris Buechler <cmb@pfsense.org>
Date: Mon, 13 Jul 2015 20:26:04 -0500
Subject: [PATCH] manual merge of Phil Davis pull request, commit
 b45537f75b24bc323987094e459db7b2f75aa405

---
 usr/local/www/load_balancer_virtual_server_edit.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/usr/local/www/load_balancer_virtual_server_edit.php b/usr/local/www/load_balancer_virtual_server_edit.php
index 102b5200c5..e14fe507fb 100644
--- a/usr/local/www/load_balancer_virtual_server_edit.php
+++ b/usr/local/www/load_balancer_virtual_server_edit.php
@@ -59,7 +59,7 @@ if (isset($id) && $a_vs[$id]) {
   $pconfig = $a_vs[$id];
 } else {
   // Sane defaults
-  $pconfig['mode'] = 'redirect';
+  $pconfig['mode'] = 'redirect_mode';
 }
 
 $changedesc = gettext("Load Balancer: Virtual Server:") . " ";
@@ -71,12 +71,12 @@ if ($_POST) {
 
 	/* input validation */
   switch($pconfig['mode']) {
-    case "redirect": {
+    case "redirect_mode": {
     	$reqdfields = explode(" ", "ipaddr name mode");
     	$reqdfieldsn = array(gettext("IP Address"),gettext("Name"),gettext("Mode"));
     	break;
     }
-    case "relay": {
+    case "relay_mode": {
     	$reqdfields = explode(" ", "ipaddr name mode relay_protocol");
     	$reqdfieldsn = array(gettext("IP Address"),gettext("Name"),gettext("Relay Protocol"));
       break;