fixes for CRM-14064

----------------------------------------
* CRM-14064: Uploading content for mailing results in empty message text and subject line
  http://issues.civicrm.org/jira/browse/CRM-14064

diff --git a/CRM/Mailing/Form/Upload.php b/CRM/Mailing/Form/Upload.php
index 531812f742cf8659c8076aadf0b09779c8cd97d6..b51e17eeab9f8ed4a068e36caaa0e7cb989457bd 100644 (file)
--- a/CRM/Mailing/Form/Upload.php
+++ b/CRM/Mailing/Form/Upload.php
@@ -258,11 +258,13 @@ class CRM_Mailing_Form_Upload extends CRM_Core_Form {
     CRM_Mailing_BAO_Mailing::commonCompose($this);
 
     $this->addElement('file', 'textFile', ts('Upload TEXT Message'), 'size=30 maxlength=60');
+    $this->addUploadElement('textFile');
     $this->setMaxFileSize(1024 * 1024);
     $this->addRule('textFile', ts('File size should be less than 1 MByte'), 'maxfilesize', 1024 * 1024);
     $this->addRule('textFile', ts('File must be in UTF-8 encoding'), 'utf8File');
 
     $this->addElement('file', 'htmlFile', ts('Upload HTML Message'), 'size=30 maxlength=60');
+    $this->addUploadElement('htmlFile');
     $this->setMaxFileSize(1024 * 1024);
     $this->addRule('htmlFile',
       ts('File size should be less than %1 MByte(s)',