Changeset 48904 for trunk

Timestamp:

08/28/2020 01:10:29 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Comments: Check if reply heading text node exists before accessing its property in comment-reply.js.

Follow-up to [47506], [48876].

Props johannadevos, mailnew2ster.
Fixes #38009.

File:

• trunk/src/js/_enqueues/lib/comment-reply.js (modified) (3 diffs)

trunk/src/js/_enqueues/lib/comment-reply.js

@@ -176 +176 @@
         temporaryElement.parentNode.replaceChild( respondElement, temporaryElement );
         cancelLink.style.display = 'none';
-        var replyHeadingElement = getElementById( config.commentReplyTitleId );
+
+        var replyHeadingElement  = getElementById( config.commentReplyTitleId );
         var replyHeadingTextNode = replyHeadingElement && replyHeadingElement.firstChild;
+
         if ( replyHeadingTextNode && replyHeadingTextNode.nodeType === Node.TEXT_NODE && headingText ) {
             replyHeadingTextNode.textContent = headingText;
         }
+
         event.preventDefault();
     }
@@ -315 +318 @@
         var element, cssHidden, style;
 
-        var replyHeading = getElementById( config.commentReplyTitleId );
+        var replyHeading         = getElementById( config.commentReplyTitleId );
         var replyHeadingTextNode = replyHeading && replyHeading.firstChild;
 
@@ -338 +341 @@
         cancelElement.style.display = '';
         addBelowElement.parentNode.insertBefore( respondElement, addBelowElement.nextSibling );
-        if ( replyHeadingTextNode.nodeType === Node.TEXT_NODE ) {
+
+        if ( replyHeadingTextNode && replyHeadingTextNode.nodeType === Node.TEXT_NODE ) {
             replyHeadingTextNode.textContent = replyTo;
         }
+
         /*
          * This is for backward compatibility with third party commenting systems