You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/02/11 11:50:24 UTC
svn commit: r1729798 - in /openmeetings/application:
branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
Author: solomax
Date: Thu Feb 11 10:50:24 2016
New Revision: 1729798
URL: http://svn.apache.org/viewvc?rev=1729798&view=rev
Log:
[OPENMEETINGS-1329] 'null' is not added to the subject
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java?rev=1729798&r1=1729797&r2=1729798&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java Thu Feb 11 10:50:24 2016
@@ -256,8 +256,9 @@ public class MessageDialog extends Abstr
}
}
+ String subj = p.getSubject() == null ? "" : p.getSubject();
getBean(MailHandler.class).send(to.getAddress().getEmail(),
- Application.getString(1301, to.getLanguageId()) + p.getSubject(),
+ Application.getString(1301, to.getLanguageId()) + subj,
(p.getMessage() == null ? "" : p.getMessage().replaceAll("\\<.*?>", "")) + aLinkHTML + invitation_link);
}
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java?rev=1729798&r1=1729797&r2=1729798&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java Thu Feb 11 10:50:24 2016
@@ -256,8 +256,9 @@ public class MessageDialog extends Abstr
}
}
+ String subj = p.getSubject() == null ? "" : p.getSubject();
getBean(MailHandler.class).send(to.getAddress().getEmail(),
- Application.getString(1301, to.getLanguageId()) + p.getSubject(),
+ Application.getString(1301, to.getLanguageId()) + subj,
(p.getMessage() == null ? "" : p.getMessage().replaceAll("\\<.*?>", "")) + aLinkHTML + invitation_link);
}
}