mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.2.0.175

Browse Source 
Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-06-07 13:16:24 +00:00
parent 4bdbaf4a88
commit 966bba02bb
8776 changed files with 346420 additions and 149650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mcs/class/System/System.Net.Mail/AlternateView.cs
View File

@ -111,16 +111,16 @@ namespace System.Net.Mail {
return av;
}
public static AlternateView CreateAlternateViewFromString (string content, Encoding encoding, string mediaType)
public static AlternateView CreateAlternateViewFromString (string content, Encoding contentEncoding, string mediaType)
{
if (content == null)
throw new ArgumentNullException ("content");
if (encoding == null)
encoding = Encoding.UTF8;
MemoryStream ms = new MemoryStream (encoding.GetBytes (content));
if (contentEncoding == null)
contentEncoding = Encoding.UTF8;
MemoryStream ms = new MemoryStream (contentEncoding.GetBytes (content));
ContentType ct = new ContentType ();
ct.MediaType = mediaType;
ct.CharSet = encoding.HeaderName;
ct.CharSet = contentEncoding.HeaderName;
AlternateView av = new AlternateView (ms, ct);
av.TransferEncoding = TransferEncoding.QuotedPrintable;
return av;