Imported Upstream version 5.2.0.175

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

View File

@ -376,14 +376,14 @@ namespace System.Web.UI.WebControls {
return ToString (Helpers.InvariantCulture);
}
public string ToString (IFormatProvider provider)
public string ToString (IFormatProvider formatProvider)
{
if (type == 0)
return String.Empty;
string ex = GetExtension (type);
return value.ToString (provider) + ex;
return value.ToString (formatProvider) + ex;
}
}