Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

subject prepend text in options for Log\Writer\Mail #3252

Closed
wants to merge 1 commit into from

2 participants

@tolean

No description provided.

@weierophinney weierophinney referenced this pull request from a commit
@weierophinney weierophinney Merge branch 'hotfix/3252' into develop
Forward port #3252

Conflicts:
	library/Zend/Log/Writer/Mail.php
	tests/ZendTest/Log/Writer/MailTest.php
8a994b7
@weierophinney

I cherry-picked this into master, as the functionality applies there as well. Thanks for the patch!

@ghost Unknown referenced this pull request from a commit
@weierophinney weierophinney Merge branch 'hotfix/3252'
Close #3252
6a3b2a1
@ghost Unknown referenced this pull request from a commit
@weierophinney weierophinney Merge branch 'hotfix/3252' into develop
Forward port #3252

Conflicts:
	library/Zend/Log/Writer/Mail.php
	tests/ZendTest/Log/Writer/MailTest.php
0c6a9a8
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Dec 19, 2012
  1. subject prepend text in options for Log\Writer\Mail

    Anatoly Marinescu authored
This page is out of date. Refresh to see the latest.
View
3  library/Zend/Log/Writer/Mail.php
@@ -85,6 +85,9 @@ public function __construct($mail, Transport\TransportInterface $transport = nul
}
if (is_array($mail)) {
+ if (isset($mail['subject_prepend_text'])) {
+ $this->setSubjectPrependText($mail['subject_prepend_text']);
+ }
parent::__construct($mail);
$transport = isset($mail['transport']) ? $mail['transport'] : null;
$mail = isset($mail['mail']) ? $mail['mail'] : null;
View
2  tests/ZendTest/Log/Writer/MailTest.php
@@ -103,11 +103,13 @@ public function testConstructWithOptions()
'formatter' => $formatter,
'mail' => $message,
'transport' => $transport,
+ 'subject_prepend_text' => 'subject prepend',
));
$this->assertAttributeEquals($message, 'mail', $writer);
$this->assertAttributeEquals($transport, 'transport', $writer);
$this->assertAttributeEquals($formatter, 'formatter', $writer);
+ $this->assertAttributeEquals('subject prepend', 'subjectPrependText', $writer);
$filters = self::readAttribute($writer, 'filters');
$this->assertCount(1, $filters);
Something went wrong with that request. Please try again.