From 30d78783ff708c6ae3a982d1237bc009c99e0bad Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 31 Oct 2019 21:53:44 -0700
Subject: [PATCH 1/1] Fix warnings for `#text` format

---
 ext/afform/core/Civi/Afform/AHQ.php           | 2 +-
 ext/afform/core/Civi/Afform/FormDataModel.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ext/afform/core/Civi/Afform/AHQ.php b/ext/afform/core/Civi/Afform/AHQ.php
index 711ad668e3..1a8f1edb61 100644
--- a/ext/afform/core/Civi/Afform/AHQ.php
+++ b/ext/afform/core/Civi/Afform/AHQ.php
@@ -19,7 +19,7 @@ class AHQ {
    * @return array
    */
   public static function getTags($element, $tagName) {
-    if ($element === [] || is_string($element)) {
+    if ($element === [] || is_string($element) || isset($element['#text'])) {
       return [];
     }
     $results = [];
diff --git a/ext/afform/core/Civi/Afform/FormDataModel.php b/ext/afform/core/Civi/Afform/FormDataModel.php
index 5055e14cf8..ec8cb7fdb2 100644
--- a/ext/afform/core/Civi/Afform/FormDataModel.php
+++ b/ext/afform/core/Civi/Afform/FormDataModel.php
@@ -54,7 +54,7 @@ class FormDataModel {
       return;
     }
     foreach ($element['#children'] as $child) {
-      if (is_string($child)) {
+      if (is_string($child) || isset($child['#text'])) {
         //nothing
       }
       elseif (!empty($child['af-fieldset']) && !empty($child['#children'])) {
-- 
2.25.1