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/ButtonField.cs
View File

@ -107,14 +107,14 @@ namespace System.Web.UI.WebControls
return base.Initialize (sortingEnabled, control);
}
protected virtual string FormatDataTextValue (object value)
protected virtual string FormatDataTextValue (object dataTextValue)
{
if (DataTextFormatString.Length > 0)
return String.Format (DataTextFormatString, value);
else if (value == null)
return String.Format (DataTextFormatString, dataTextValue);
else if (dataTextValue == null)
return String.Empty;
else
return value.ToString ();
return dataTextValue.ToString ();
}
public override void InitializeCell (DataControlFieldCell cell, DataControlCellType cellType, DataControlRowState rowState, int rowIndex)