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

@ -68,12 +68,12 @@ namespace System.Web.UI.WebControls
return new CookieParameter (this);
}
protected internal
override object Evaluate (HttpContext ctx, Control control)
override object Evaluate (HttpContext context, Control control)
{
if (ctx == null || ctx.Request == null)
if (context == null || context.Request == null)
return null;
HttpCookie c = ctx.Request.Cookies [CookieName];
HttpCookie c = context.Request.Cookies [CookieName];
if (c == null)
return null;