View | Details | Raw Unified | Return to bug 8119 | Differences between
and this patch

Collapse All | Expand All

(-)a/lib/pkp/classes/notification/NotificationManager.inc.php (-1 / +1 lines)
 Lines 107-113   class NotificationManager { Link Here 
107
			$context =& Request::getContext();
107
			$context =& Request::getContext();
108
			$site =& Request::getSite();
108
			$site =& Request::getSite();
109
109
110
			$mail = new MailTemplate('NOTIFICATION_MAILLIST');
110
			$mail = new MailTemplate('NOTIFICATION_MAILLIST', null, null, null, null, true, true);
111
			$mail->setFrom($site->getLocalizedContactEmail(), $site->getLocalizedContactName());
111
			$mail->setFrom($site->getLocalizedContactEmail(), $site->getLocalizedContactName());
112
			$mail->assignParams(array(
112
			$mail->assignParams(array(
113
				'notificationContents' => $notificationContents,
113
				'notificationContents' => $notificationContents,
(-)a/classes/mail/MailTemplate.inc.php (-2 / +3 lines)
 Lines 29-36   class MailTemplate extends PKPMailTemplate { Link Here 
29
	 * @param $conference object optional The conference this message relates to
29
	 * @param $conference object optional The conference this message relates to
30
	 * @param $schedConf object optional The scheduled conference this message relates to
30
	 * @param $schedConf object optional The scheduled conference this message relates to
31
	 * @param $includeSignature boolean optional
31
	 * @param $includeSignature boolean optional
32
	 * @param $ignorePostedData boolean optional
32
	 */
33
	 */
33
	function MailTemplate($emailKey = null, $locale = null, $enableAttachments = null, $conference = null, $schedConf = null, $includeSignature = true) {
34
	function MailTemplate($emailKey = null, $locale = null, $enableAttachments = null, $conference = null, $schedConf = null, $includeSignature = true, $ignorePostedData = false) {
34
		parent::PKPMailTemplate($emailKey, $locale, $enableAttachments, $includeSignature);
35
		parent::PKPMailTemplate($emailKey, $locale, $enableAttachments, $includeSignature);
35
36
36
		// If a conference wasn't specified, use the current request.
37
		// If a conference wasn't specified, use the current request.
 Lines 49-55   class MailTemplate extends PKPMailTemplate { Link Here 
49
			if (!empty($userSig)) $userSig = "\n" . $userSig;
50
			if (!empty($userSig)) $userSig = "\n" . $userSig;
50
		}
51
		}
51
52
52
		if (isset($emailTemplate) && (Request::getUserVar('subject')==null || Request::getUserVar('body')==null)) {
53
		if (isset($emailTemplate) && ($ignorePostedData || (Request::getUserVar('subject')==null && Request::getUserVar('body')==null))) {
53
			$this->setSubject($emailTemplate->getSubject());
54
			$this->setSubject($emailTemplate->getSubject());
54
			$this->setBody($emailTemplate->getBody() . $userSig);
55
			$this->setBody($emailTemplate->getBody() . $userSig);
55
			$this->enabled = $emailTemplate->getEnabled();
56
			$this->enabled = $emailTemplate->getEnabled();

Return to bug 8119