Author: krasnov
Date: 2007-01-18 05:27:56 -0500 (Thu, 18 Jan 2007)
New Revision: 71246
Modified:
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.Profile/ChangeLog
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.Profile/ProfileModule.cs
Log:
merge -r 71244:71245
Modified:
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.Profile/ChangeLog
===================================================================
---
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.Profile/ChangeLog
2007-01-18 10:26:04 UTC (rev 71245)
+++
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.Profile/ChangeLog
2007-01-18 10:27:56 UTC (rev 71246)
@@ -1,3 +1,8 @@
+2007-01-18 Vladimir Krasnov <[EMAIL PROTECTED]>
+
+ * ProfileModule.cs: fixed OnLeave, AutomaticSaveEnabled should be
+ checked before save
+
2007-01-02 Vladimir Krasnov <[EMAIL PROTECTED]>
* ProfileBase.cs: fixed SetPropertyValue, allow anonymous attribute
Modified:
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.Profile/ProfileModule.cs
===================================================================
---
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.Profile/ProfileModule.cs
2007-01-18 10:26:04 UTC (rev 71245)
+++
branches/mainsoft/gh20preview2/mcs/class/System.Web/System.Web.Profile/ProfileModule.cs
2007-01-18 10:27:56 UTC (rev 71246)
@@ -93,18 +93,20 @@
if (!ProfileManager.Enabled)
return;
- profile = app.Context.Profile;
-
- if (profile == null)
- return;
-
- if (ProfileAutoSaving != null) {
- ProfileAutoSaveEventArgs args = new
ProfileAutoSaveEventArgs (app.Context);
- ProfileAutoSaving (this, args);
- if (!args.ContinueWithProfileAutoSave)
- return;
+ if (ProfileManager.AutomaticSaveEnabled) {
+ profile = app.Context.Profile;
+
+ if (profile == null)
+ return;
+
+ if (ProfileAutoSaving != null) {
+ ProfileAutoSaveEventArgs args = new
ProfileAutoSaveEventArgs (app.Context);
+ ProfileAutoSaving (this, args);
+ if (!args.ContinueWithProfileAutoSave)
+ return;
+ }
+ profile.Save ();
}
- profile.Save();
}
public event ProfileMigrateEventHandler MigrateAnonymous;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
