From: Tim Otten <totten@civicrm.org>
Date: Fri, 1 Nov 2019 04:53:44 +0000 (-0700)
Subject: Fix warnings for `#text` format
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=30d78783ff708c6ae3a982d1237bc009c99e0bad;hp=aaf3e9b30c252c135f3f98b50c10370c042a2ac7;p=civicrm-core.git

Fix warnings for `#text` format
---

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'])) {