diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Config/Diagnostics.config b/src/Orchard.Azure/Orchard.Azure.Web/Config/Diagnostics.config
index 124536a7d..d603238d2 100644
--- a/src/Orchard.Azure/Orchard.Azure.Web/Config/Diagnostics.config
+++ b/src/Orchard.Azure/Orchard.Azure.Web/Config/Diagnostics.config
@@ -3,25 +3,25 @@
-
+
-
+
-
+
-
+
diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Web.config b/src/Orchard.Azure/Orchard.Azure.Web/Web.config
index b1de2f004..722cd267a 100644
--- a/src/Orchard.Azure/Orchard.Azure.Web/Web.config
+++ b/src/Orchard.Azure/Orchard.Azure.Web/Web.config
@@ -8,151 +8,205 @@
\Windows\Microsoft.Net\Framework\v2.x\Config
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Handlers/PageHandler.cs b/src/Orchard.Web/Modules/Orchard.Pages/Handlers/PageHandler.cs
index 6b3b2e7a9..ef9d535ec 100644
--- a/src/Orchard.Web/Modules/Orchard.Pages/Handlers/PageHandler.cs
+++ b/src/Orchard.Web/Modules/Orchard.Pages/Handlers/PageHandler.cs
@@ -28,7 +28,7 @@ namespace Orchard.Pages.Handlers {
Filters.Add(new ActivatingFilter(PageDriver.ContentType.Name));
Filters.Add(new ActivatingFilter(PageDriver.ContentType.Name));
- OnLoaded((context, p) => p.ScheduledPublishUtc = _pageService.GetScheduledPublishUtc(p));
+ OnLoaded((context, page) => page._scheduledPublishUtc.Loader(value => _pageService.GetScheduledPublishUtc(page)));
}
Localizer T { get; set; }
diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Models/Page.cs b/src/Orchard.Web/Modules/Orchard.Pages/Models/Page.cs
index 178bccf7c..800747dc0 100644
--- a/src/Orchard.Web/Modules/Orchard.Pages/Models/Page.cs
+++ b/src/Orchard.Web/Modules/Orchard.Pages/Models/Page.cs
@@ -1,6 +1,7 @@
using System;
using System.Web.Mvc;
using Orchard.ContentManagement;
+using Orchard.ContentManagement.Utilities;
using Orchard.Core.Common.Models;
using Orchard.Security;
@@ -52,7 +53,8 @@ namespace Orchard.Pages.Models {
}
}
- public DateTime? ScheduledPublishUtc { get; set; }
+ public readonly LazyField _scheduledPublishUtc = new LazyField();
+ public DateTime? ScheduledPublishUtc { get { return _scheduledPublishUtc.Value; } set{ _scheduledPublishUtc.Value = value;} }
private string _scheduledPublishUtcDate;
diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Services/RolesBasedAuthorizationService.cs b/src/Orchard.Web/Modules/Orchard.Roles/Services/RolesBasedAuthorizationService.cs
index bc64d983d..d7a84b18d 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/Services/RolesBasedAuthorizationService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Services/RolesBasedAuthorizationService.cs
@@ -65,6 +65,8 @@ namespace Orchard.Roles.Services {
foreach (var role in rolesToExamine) {
RoleRecord roleRecord = _roleService.GetRoleByName(role);
+ if ( roleRecord == null )
+ continue;
foreach (var permissionName in _roleService.GetPermissionsForRole(roleRecord.Id)) {
string possessedName = permissionName;
if (grantingNames.Any(grantingName => String.Equals(possessedName, grantingName, StringComparison.OrdinalIgnoreCase))) {