Merge pull request #4045 from lambdageek/bug-47867

[mono.git] / mcs / class / System.Web / System.Web.Mail / MailMessageWrapper.cs

diff --git a/mcs/class/System.Web/System.Web.Mail/MailMessageWrapper.cs b/mcs/class/System.Web/System.Web.Mail/MailMessageWrapper.cs
index f50ec10c7bdc5df331c7933729e54489b47465a1..3fe644e221f2cc0811a216d1031c0c2229a1ecac 100644 (file)
--- a/mcs/class/System.Web/System.Web.Mail/MailMessageWrapper.cs
+++ b/mcs/class/System.Web/System.Web.Mail/MailMessageWrapper.cs
@@ -38,13 +38,13 @@ namespace System.Web.Mail {
     // addresses instead of a single string
     internal class MailMessageWrapper {
                
-       private MailAddressCollection bcc = new MailAddressCollection();
-       private MailAddressCollection cc = new MailAddressCollection();         
-       private MailAddress from;
-       private MailAddressCollection to = new MailAddressCollection();
-       private MailHeader header = new MailHeader();
-       private MailMessage message;
-       private string body;
+       MailAddressCollection bcc = new MailAddressCollection();
+       MailAddressCollection cc = new MailAddressCollection();
+       MailAddress from;
+       MailAddressCollection to = new MailAddressCollection();
+       MailHeader header = new MailHeader();
+       MailMessage message;
+       string body;
                
        // Constructor          
        public MailMessageWrapper( MailMessage message )
@@ -79,9 +79,7 @@ namespace System.Web.Mail {
                                
                    byte[] subjectBytes = message.BodyEncoding.GetBytes( message.Subject );
                    // encode the subject with Base64
-                   header.Subject = String.Format( "=?{0}?B?{1}?=" , 
-                                                   message.BodyEncoding.BodyName ,
-                                                   Convert.ToBase64String( subjectBytes ) );
+                   header.Subject = "=?" + message.BodyEncoding.BodyName + "?B?" + Convert.ToBase64String (subjectBytes) + "?=";
                } else {
                    
                    header.Subject = message.Subject;
@@ -109,22 +107,18 @@ namespace System.Web.Mail {
 
                    
            // set the content type
-           switch( message.BodyFormat ) {
-               
-           case MailFormat.Html: 
-               header.ContentType = 
-                   String.Format( "text/html; charset=\"{0}\"" , message.BodyEncoding.BodyName ); 
-               break;
+           switch( message.BodyFormat ) {              
+                   case MailFormat.Html: 
+                           header.ContentType = String.Concat ( "text/html; charset=\"", message.BodyEncoding.BodyName, "\""); 
+                           break;
            
-           case MailFormat.Text: 
-               header.ContentType = 
-                   String.Format( "text/plain; charset=\"{0}\"" , message.BodyEncoding.BodyName );
-               break;
+                   case MailFormat.Text: 
+                           header.ContentType = String.Concat ( "text/plain; charset=\"", message.BodyEncoding.BodyName, "\"");
+                           break;
            
-           default: 
-               header.ContentType = 
-                   String.Format( "text/html; charset=\"{0}\"" , message.BodyEncoding.BodyName );
-               break;
+                   default: 
+                           header.ContentType = String.Concat ( "text/html; charset=\"", message.BodyEncoding.BodyName, "\"");
+                           break;
            }
            
                    
@@ -234,24 +228,16 @@ namespace System.Web.Mail {
            get { return message.UrlContentLocation; } 
        }
 
-#if NET_1_1
                public MailHeader Fields {
                        get {
                                        MailHeader bodyHeaders = new MailHeader();
                                        // Add Fields to MailHeader Object
                                        foreach( string key in message.Fields.Keys )
-                                               bodyHeaders.Data[ key ] = (string)this.message.Fields[ key ];
+                                               bodyHeaders.Data[ key ] = this.message.Fields[ key ].ToString();
 
                                        return bodyHeaders;
                        }
                        
                }
-#endif
-
-#if NET_2_0
-               public IList RelatedBodyParts {
-                       get { return message.RelatedBodyParts; }
-               }
-#endif
     }   
 }