From 8fba640bc680c8d7a03453445baac5d6ce831048 Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Mon, 1 Oct 2018 22:01:33 +0200
Subject: [PATCH] mvc, refactor __items usage in BaseField type, for
 https://github.com/opnsense/core/issues/2670

---
 .../mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 0783930ad..04802d391 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/BaseField.php
@@ -522,7 +522,7 @@ abstract class BaseField
             return array($this);
         }
 
-        foreach ($this->__items as $node) {
+        foreach ($this->iterateItems() as $node) {
             foreach ($node->getFlatNodes() as $childNode) {
                 $result[$childNode->internalReference] = $childNode;
             }
@@ -539,7 +539,7 @@ abstract class BaseField
     public function getNodes()
     {
         $result = array ();
-        foreach ($this->__items as $key => $node) {
+        foreach ($this->iterateItems() as $key => $node) {
             if ($node->isContainer()) {
                 $result[$key] = $node->getNodes();
             } else {
@@ -568,7 +568,7 @@ abstract class BaseField
     public function setNodes($data)
     {
         // update structure with new content
-        foreach ($this->__items as $key => $node) {
+        foreach ($this->iterateItems() as $key => $node) {
             if ($data != null && isset($data[$key])) {
                 if ($node->isContainer()) {
                     if (is_array($data[$key])) {
@@ -618,7 +618,7 @@ abstract class BaseField
             }
         }
 
-        foreach ($this->__items as $key => $FieldNode) {
+        foreach ($this->iterateItems() as $key => $FieldNode) {
             $FieldNode->addToXMLNode($subnode);
         }
     }