From 83ef061392f2d278f3d986374de43b281c916fef Mon Sep 17 00:00:00 2001
From: "Code Hugger (Matthew Jones)" <jonespm@gmail.com>
Date: Sat, 28 Dec 2024 17:42:48 -0500
Subject: [PATCH] SAK-50792 Discussions: insert original text fails (#13142)

---
 .../messageforums-app/src/webapp/jsp/dfMessageReply.jsp   | 8 ++++----
 .../src/webapp/jsp/dfMessageReplyThread.jsp               | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/msgcntr/messageforums-app/src/webapp/jsp/dfMessageReply.jsp b/msgcntr/messageforums-app/src/webapp/jsp/dfMessageReply.jsp
index 1c73b8c5a58e..fdad61864906 100644
--- a/msgcntr/messageforums-app/src/webapp/jsp/dfMessageReply.jsp
+++ b/msgcntr/messageforums-app/src/webapp/jsp/dfMessageReply.jsp
@@ -122,10 +122,10 @@
             <sakai:inputRichText textareaOnly="#{PrivateMessagesTool.mobileSession}" value="#{ForumTool.composeBody}" id="df_compose_body" rows="#{ForumTool.editorRows}" cols="132">
 			</sakai:inputRichText>
 			<script>
-	        // set the previous message variable
-				var textareas = document.getElementsByTagName("textarea");
-				var rteId = textareas.item(1).id;
-
+	        // Give it a chance to try to detect the name incase it might change
+	        const textarea = document.currentScript.previousElementSibling?.querySelector('textarea'); // Select the first <textarea> in the previous sibling
+	        // Set the value found else default to the one we last used. This value is used in forum.js
+	        const rteId = textarea ? textarea.id : "dfCompose:df_compose_body_inputRichText";
 	        var messagetext = document.forms['dfCompose'].elements['dfCompose:msgHidden'].value;
 	        var titletext = document.forms['dfCompose'].elements['dfCompose:titleHidden'].value;
             </script>
diff --git a/msgcntr/messageforums-app/src/webapp/jsp/dfMessageReplyThread.jsp b/msgcntr/messageforums-app/src/webapp/jsp/dfMessageReplyThread.jsp
index 397fcc922591..3c1c4a7b5648 100644
--- a/msgcntr/messageforums-app/src/webapp/jsp/dfMessageReplyThread.jsp
+++ b/msgcntr/messageforums-app/src/webapp/jsp/dfMessageReplyThread.jsp
@@ -142,9 +142,10 @@
 				CKEDITOR.on('instanceReady', function() {resizeFrame('grow')});
 			</script --%>
 		<script>
-			var textareas = document.getElementsByTagName("textarea");
-			var rteId = textareas.item(1).id;
-	        // set the previous message variable
+	        // Give it a chance to try to detect the name incase it might change
+	        const textarea = document.currentScript.previousElementSibling?.querySelector('textarea'); // Select the first <textarea> in the previous sibling
+	        // Set the value found else default to the one we last used. This value is used in forum.js
+	        const rteId = textarea ? textarea.id : "dfCompose:df_compose_body_inputRichText";
 	        var messagetext = document.forms['dfCompose'].elements['dfCompose:msgHidden'].value;
 	        var titletext = document.forms['dfCompose'].elements['dfCompose:titleHidden'].value;
             </script>