diff options
Diffstat (limited to 'src/wix/WixToolset.Core/ExtensibilityServices/ParseHelper.cs')
-rw-r--r-- | src/wix/WixToolset.Core/ExtensibilityServices/ParseHelper.cs | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/wix/WixToolset.Core/ExtensibilityServices/ParseHelper.cs b/src/wix/WixToolset.Core/ExtensibilityServices/ParseHelper.cs index 0ec5b514..64ac8651 100644 --- a/src/wix/WixToolset.Core/ExtensibilityServices/ParseHelper.cs +++ b/src/wix/WixToolset.Core/ExtensibilityServices/ParseHelper.cs | |||
@@ -658,15 +658,12 @@ namespace WixToolset.Core.ExtensibilityServices | |||
658 | 658 | ||
659 | public void InnerTextDisallowed(XElement element) | 659 | public void InnerTextDisallowed(XElement element) |
660 | { | 660 | { |
661 | if (element.Nodes().Any(n => XmlNodeType.Text == n.NodeType || XmlNodeType.CDATA == n.NodeType)) | 661 | Common.InnerTextDisallowed(this.Messaging, element, null); |
662 | { | 662 | } |
663 | var innerText = Common.GetInnerText(element); | 663 | |
664 | if (!String.IsNullOrWhiteSpace(innerText)) | 664 | public void InnerTextDisallowed(XElement element, string attributeName) |
665 | { | 665 | { |
666 | var sourceLineNumbers = this.GetSourceLineNumbers(element); | 666 | Common.InnerTextDisallowed(this.Messaging, element, attributeName); |
667 | this.Messaging.Write(ErrorMessages.IllegalInnerText(sourceLineNumbers, element.Name.LocalName, innerText)); | ||
668 | } | ||
669 | } | ||
670 | } | 667 | } |
671 | 668 | ||
672 | public bool IsValidIdentifier(string value) | 669 | public bool IsValidIdentifier(string value) |