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

8
mcs/class/System.Web/System.Web.UI.WebControls/BoundField.cs
View File

@ -186,12 +186,12 @@ namespace System.Web.UI.WebControls
get { return true; }
}
protected virtual string FormatDataValue (object value, bool encode)
protected virtual string FormatDataValue (object dataValue, bool encode)
{
string res;
bool htmlEncodeFormatString = HtmlEncodeFormatString;
string stringValue = (value != null) ? value.ToString () : String.Empty;
if (value == null || (stringValue.Length == 0 && ConvertEmptyStringToNull)) {
string stringValue = (dataValue != null) ? dataValue.ToString () : String.Empty;
if (dataValue == null || (stringValue.Length == 0 && ConvertEmptyStringToNull)) {
if (NullDisplayText.Length == 0) {
encode = false;
res = " ";
@ -201,7 +201,7 @@ namespace System.Web.UI.WebControls
string format = DataFormatString;
if (!String.IsNullOrEmpty (format)) {
if (!encode || htmlEncodeFormatString)
res = String.Format (format, value);
res = String.Format (format, dataValue);
else
res = String.Format (format, encode ? HttpUtility.HtmlEncode (stringValue) : stringValue);
} else