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

@ -506,17 +506,17 @@ namespace System.Web.UI.WebControls
Expanded = !Expanded.GetValueOrDefault(false);
}
void IStateManager.LoadViewState (object savedState)
void IStateManager.LoadViewState (object state)
{
LoadViewState (savedState);
LoadViewState (state);
}
protected virtual void LoadViewState (object savedState)
protected virtual void LoadViewState (object state)
{
if (savedState == null)
if (state == null)
return;
object[] states = (object[]) savedState;
object[] states = (object[]) state;
ViewState.LoadViewState (states [0]);
if (tree != null && SelectedFlag)