From 9cc07ed4ac2efd4c8e04081fba2b98f513888cdd Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Thu, 14 Jul 2022 18:53:36 +0200
Subject: [PATCH] MVC / BaseField - two regressions in
 https://github.com/opnsense/core/commit/fc8890851a87d3041b820d801e6a386b88ee244b

o GetInternalIsVirtual --> getInternalIsVirtual
o spurious getInternalIsVirtual() in setNodes() on null object

for https://github.com/opnsense/core/issues/5874
---
 .../mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php
index e5d499d25..2e432c96d 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php
@@ -498,7 +498,7 @@ abstract class BaseField
                 $parentNode = $this->getParentNode();
                 if (count($parts) == 2) {
                     $tagName = $parts[0];
-                    if (isset($parentNode->$tagName) && !$parentNode->$tagName->GetInternalIsVirtual()) {
+                    if (isset($parentNode->$tagName) && !$parentNode->$tagName->getInternalIsVirtual()) {
                         $ref_constraint = $parentNode->$tagName->getConstraintByName($parts[1]);
                         if ($ref_constraint != null) {
                             $result[] = $ref_constraint;
@@ -629,7 +629,7 @@ abstract class BaseField
         // add new items to array type objects
         if ($this->isArrayType()) {
             foreach ($data as $dataKey => $dataValue) {
-                if (!isset($this->$dataKey) && !$this->$dataKey->GetInternalIsVirtual()) {
+                if (!isset($this->$dataKey)) {
                     $node = $this->add();
                     $node->setNodes($dataValue);
                 }