Centralize disallow inner text handling in ParseHalper

Fixes wixtoolset/issues#6237

1 files changed, 3 insertions, 7 deletions

diff --git a/src/WixToolset.Core/Compiler_UI.cs b/src/WixToolset.Core/Compiler_UI.cs
index 5cc9b5a0..d712ec91 100644
--- a/src/WixToolset.Core/Compiler_UI.cs
+++ b/src/WixToolset.Core/Compiler_UI.cs
@@ -700,8 +700,6 @@ namespace WixToolset.Core
                 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Action"));
             }
 
-            this.Core.VerifyNoInnerText(sourceLineNumbers, node);
-
             this.Core.ParseForExtensionElements(node);
 
             if (!this.Core.EncounteredError)
@@ -748,8 +746,6 @@ namespace WixToolset.Core
                 }
             }
 
-            this.Core.VerifyNoInnerText(sourceLineNumbers, node);
-
             if (null == id)
             {
                 id = this.Core.CreateIdentifier("txt", text);
@@ -1425,7 +1421,7 @@ namespace WixToolset.Core
                             }
                         }
 
-                        this.Core.VerifyNoInnerText(sourceLineNumbers, node);
+                        this.Core.InnerTextDisallowed(child);
 
                         if (!String.IsNullOrEmpty(text) && null != sourceFile)
                         {
@@ -1443,6 +1439,8 @@ namespace WixToolset.Core
                 }
             }
 
+            this.Core.InnerTextDisallowed(node);
+
             // If the radio buttons have icons, then we need to add the icon attribute.
             switch (radioButtonsType)
             {
@@ -1694,8 +1692,6 @@ namespace WixToolset.Core
                 }
             }
 
-            this.Core.VerifyNoInnerText(sourceLineNumbers, node);
-
             if (null == control)
             {
                 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Control"));