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

12
mcs/class/System.Web/System.Web.UI.WebControls/ImageField.cs
View File

@ -46,9 +46,9 @@ namespace System.Web.UI.WebControls {
PropertyDescriptor imageProperty;
PropertyDescriptor textProperty;
public override bool Initialize (bool sortingEnabled, Control control)
public override bool Initialize (bool enableSorting, Control control)
{
return base.Initialize (sortingEnabled, control);
return base.Initialize (enableSorting, control);
}
[DefaultValueAttribute ("")]
@ -237,14 +237,14 @@ namespace System.Web.UI.WebControls {
}
}
protected virtual string FormatImageUrlValue (object value)
protected virtual string FormatImageUrlValue (object dataValue)
{
if (value == null)
if (dataValue == null)
return null;
else if (DataImageUrlFormatString.Length > 0)
return string.Format (DataImageUrlFormatString, value);
return string.Format (DataImageUrlFormatString, dataValue);
else
return value.ToString ();
return dataValue.ToString ();
}
protected virtual string GetFormattedAlternateText (Control controlContainer)