Merge branch 'hotfix/3252' into develop

Forward port zendframework/zendframework#3252 Conflicts: library/Zend/Log/Writer/Mail.php tests/ZendTest/Log/Writer/MailTest.php
zendframework · Dec 19, 2012 · 8faa67f · 8faa67f
commit 8faa67f
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/Writer/Mail.php b/src/Writer/Mail.php
@@ -86,6 +86,9 @@ public function __construct($mail, Transport\TransportInterface $transport = nul
 
         if (is_array($mail)) {
             parent::__construct($mail);
+            if (isset($mail['subject_prepend_text'])) {
+                $this->setSubjectPrependText($mail['subject_prepend_text']);
+            }
             $transport = isset($mail['transport']) ? $mail['transport'] : null;
             $mail      = isset($mail['mail']) ? $mail['mail'] : null;
         }