SAK-45017: Error in sending mails without subject (sakaiproject#9016)

aagrandaz · Mar 10, 2021 · 570b788 · 570b788
1 parent 226e164
commit 570b788
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/...geforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages.properties b/...geforums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages.properties
@@ -678,6 +678,8 @@ pvt_email_footer4_b=To reply to this message click this link to access Messages
 pvt_msgs_replied=Replied messages
 pvt_replied=Already replied
 
+pvt_no_subject=No subject
+
 syn_anon=No unread message counts as you aren't logged in.
 syn_mark_as_read=Mark all as read
 syn_site_heading=Site

diff --git a/...orums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages_es.properties b/...orums-api/src/bundle/org/sakaiproject/api/app/messagecenter/bundle/Messages_es.properties
@@ -669,6 +669,8 @@ pvt_email_footer4_b=Para responder al mensaje, haga clic en este enlace y acceda
 pvt_msgs_replied=Mensajes respondidos
 pvt_replied=Respondido
 
+pvt_no_subject=Sin asunto
+
 syn_anon=Si no hay mensajes sin leer, se considera que no est\u00e1 conectado.
 syn_mark_as_read=Marcar todos como le\u00eddos
 syn_site_heading=Sitio

diff --git a/...l/src/java/org/sakaiproject/component/app/messageforums/ui/PrivateMessageManagerImpl.java b/...l/src/java/org/sakaiproject/component/app/messageforums/ui/PrivateMessageManagerImpl.java
@@ -2126,7 +2126,11 @@ public PrivateMessage getPrivateMessage(final String id) throws MessagingExcepti
   private PrivateMessage createResponseMessage(PrivateMessage currentMessage, MimeMessage msg, String from) throws MessagingException {
 	  PrivateMessage rrepMsg = messageManager.createPrivateMessage() ;
 
-	  rrepMsg.setTitle(msg.getSubject());
+	  if (StringUtils.isBlank(msg.getSubject())) {
+		  rrepMsg.setTitle("[" + getResourceBundleString("pvt_no_subject") + "]");
+	  } else {
+		  rrepMsg.setTitle(msg.getSubject());
+	  }
 	  try {
 		  rrepMsg.setCreatedBy(userDirectoryService.getUserByEid(from).getId());
 	  } catch (UserNotDefinedException e) {