Author: igorz
Date: 2008-02-20 07:14:11 -0500 (Wed, 20 Feb 2008)
New Revision: 96242
Modified:
trunk/mcs/class/System.Web.Extensions/System.Web.UI/ScriptManager.cs
Log:
merge r96240:96241
Modified: trunk/mcs/class/System.Web.Extensions/System.Web.UI/ScriptManager.cs
===================================================================
--- trunk/mcs/class/System.Web.Extensions/System.Web.UI/ScriptManager.cs
2008-02-20 12:12:17 UTC (rev 96241)
+++ trunk/mcs/class/System.Web.Extensions/System.Web.UI/ScriptManager.cs
2008-02-20 12:14:11 UTC (rev 96242)
@@ -523,8 +523,11 @@
sb.AppendLine
("Sys.Services.ProfileService.set_path('" + profileServicePath + "');");
ScriptingAuthenticationServiceSection
authenticationService = (ScriptingAuthenticationServiceSection)
WebConfigurationManager.GetSection
("system.web.extensions/scripting/webServices/authenticationService");
- if (authenticationService.Enabled)
+ if (authenticationService.Enabled) {
sb.AppendLine
("Sys.Services._AuthenticationService.DefaultWebServicePath = '" +
ResolveClientUrl ("~/Authentication_JSON_AppService.axd") + "';");
+ if (Page.User.Identity.IsAuthenticated)
+ sb.AppendLine
("Sys.Services.AuthenticationService._setAuthenticated(true);");
+ }
string authenticationServicePath =
GetAuthenticationServicePath ();
if (!String.IsNullOrEmpty
(authenticationServicePath))
sb.AppendLine
("Sys.Services.AuthenticationService.set_path('" + authenticationServicePath +
"');");
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
