From c4d42929fb7c76f528c023c4286b2e23355e659f Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Sat, 13 Apr 2019 17:35:34 +0200
Subject: [PATCH] Routing, gateways. missed two statements where friendlyiface
 was used, since we keep the configured "interface", these need to be renamed.
 for https://github.com/opnsense/core/issues/2279

---
 src/etc/inc/system.inc                 | 2 +-
 src/www/system_gateway_groups_edit.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
index b1d52c7b8..e184134b1 100644
--- a/src/etc/inc/system.inc
+++ b/src/etc/inc/system.inc
@@ -508,7 +508,7 @@ function system_staticroutes_configure($interface = '')
                 continue;
             }
             $gateway = $gateways_arr[$rtent['gateway']];
-            if (!empty($interface) && $interface != $gateway['friendlyiface']) {
+            if (!empty($interface) && $interface != $gateway['interface']) {
                 continue;
             }
 
diff --git a/src/www/system_gateway_groups_edit.php b/src/www/system_gateway_groups_edit.php
index 3b9f61d50..22f267ee9 100644
--- a/src/www/system_gateway_groups_edit.php
+++ b/src/www/system_gateway_groups_edit.php
@@ -241,7 +241,7 @@ $( document ).ready(function() {
                               </option>
 <?php
                               foreach (get_configured_carp_interface_list() as $vip => $address):
-                                  if (!preg_match("/^{$gateway['friendlyiface']}_/i", $vip)) {
+                                  if (!preg_match("/^{$gateway['interface']}_/i", $vip)) {
                                       continue;
                                   }
                                   if (($gateway['ipprotocol'] == "inet") && (!is_ipaddrv4($address))) {