1
0
mirror of https://github.com/moodle/moodle.git synced 2025-04-23 09:23:09 +02:00

Merge branch 'MDL-60997-master' of git://github.com/junpataleta/moodle

This commit is contained in:
David Monllao 2018-01-29 10:38:58 +01:00 committed by Jake Dallimore
commit f372f96656
2 changed files with 6 additions and 0 deletions
lib
classes/message
tests

@ -101,6 +101,9 @@ class message {
/** @var string An email address which can be used to send an reply. */
private $replyto;
/** @var string A name which can be used with replyto. */
private $replytoname;
/** @var int Used internally to store the id of the row representing this message in DB. */
private $savedmessageid;
@ -130,6 +133,7 @@ class message {
'contexturl',
'contexturlname',
'replyto',
'replytoname',
'savedmessageid',
'attachment',
'attachname',

@ -62,6 +62,7 @@ class core_message_testcase extends advanced_testcase {
$message->contexturl = 'http://GalaxyFarFarAway.com';
$message->contexturlname = 'Context name';
$message->replyto = "random@example.com";
$message->replytoname = fullname($USER);
$message->attachname = 'attachment';
$content = array('*' => array('header' => ' test ', 'footer' => ' test ')); // Extra content for all types of messages.
$message->set_additional_content('test', $content);
@ -96,6 +97,7 @@ class core_message_testcase extends advanced_testcase {
$this->assertSame($message->contexturl, $stdclass->contexturl);
$this->assertSame($message->contexturlname, $stdclass->contexturlname);
$this->assertSame($message->replyto, $stdclass->replyto);
$this->assertSame($message->replytoname, $stdclass->replytoname);
$this->assertSame($message->attachname, $stdclass->attachname);
// Extra content for fullmessage only.