Skip to content

Commit 17fed89

Browse files
David Monllaosnake
authored andcommitted
Merge branch 'MDL-60997-34' of git://github.com/junpataleta/moodle into MOODLE_34_STABLE
2 parents 350e280 + 34f90c2 commit 17fed89

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

lib/classes/message/message.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,9 @@ class message {
101101
/** @var string An email address which can be used to send an reply. */
102102
private $replyto;
103103

104+
/** @var string A name which can be used with replyto. */
105+
private $replytoname;
106+
104107
/** @var int Used internally to store the id of the row representing this message in DB. */
105108
private $savedmessageid;
106109

@@ -130,6 +133,7 @@ class message {
130133
'contexturl',
131134
'contexturlname',
132135
'replyto',
136+
'replytoname',
133137
'savedmessageid',
134138
'attachment',
135139
'attachname',

lib/tests/message_test.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ public function test_get_eventobject_for_processor() {
6262
$message->contexturl = 'http://GalaxyFarFarAway.com';
6363
$message->contexturlname = 'Context name';
6464
$message->replyto = "random@example.com";
65+
$message->replytoname = fullname($USER);
6566
$message->attachname = 'attachment';
6667
$content = array('*' => array('header' => ' test ', 'footer' => ' test ')); // Extra content for all types of messages.
6768
$message->set_additional_content('test', $content);
@@ -96,6 +97,7 @@ public function test_get_eventobject_for_processor() {
9697
$this->assertSame($message->contexturl, $stdclass->contexturl);
9798
$this->assertSame($message->contexturlname, $stdclass->contexturlname);
9899
$this->assertSame($message->replyto, $stdclass->replyto);
100+
$this->assertSame($message->replytoname, $stdclass->replytoname);
99101
$this->assertSame($message->attachname, $stdclass->attachname);
100102

101103
// Extra content for fullmessage only.

0 commit comments

Comments
 (0)