Merge

--HG--
branch : dev

AzurePackage.proj

@@ -109,6 +109,23 @@
     <Copy SourceFiles="@(Stage-Modules)" DestinationFolder="$(CloudRootFolder)\Modules\%(RecursiveDir)" />
     <Copy SourceFiles="@(Stage-Modules-Bin)" DestinationFolder="$(CloudRootFolder)\bin\" />
 
+    <!-- extra processing of the staged config files -->
+    <XmlUpdate XmlFileName="$(CloudRootFolder)\web.config"
+      XPath="/configuration/system.web/compilation/@debug"
+      Value="false" />
+
+    <XmlUpdate XmlFileName="$(CloudRootFolder)\Config\Diagnostics.config"
+      XPath="/system.diagnostics/trace/@autoflush"
+      Value="false" />
+
+    <XmlUpdate XmlFileName="$(CloudRootFolder)\Config\Diagnostics.config"
+      XPath="/system.diagnostics/sources/source/@switchValue"
+      Value="Error" />
+
+    <!-- move over extra non-content files the csproj referenced -->
+    <Copy SourceFiles="@(StageProjectAlteration-ExtraFiles->'$(SrcFolder)\Orchard.Web\%(Identity)')" 
+        DestinationFolder="$(StageFolder)\%(RecursiveDir)"/>
+
     <!-- use x64 sqlite for tests depending on build platform -->
     <Copy 
       SourceFiles="$(LibFolder)\sqlite\x64\System.Data.SQLite.dll" 

Orchard.proj

@@ -118,6 +118,20 @@
       <Output TaskParameter="ExtraFiles" ItemName="StageProjectAlteration-ExtraFiles"/>
     </StageProjectAlteration>
 
+    <!-- extra processing of the staged config files -->
+
+    <XmlUpdate XmlFileName="$(StageFolder)\web.config"
+      XPath="/configuration/system.web/compilation/@debug"
+      Value="false" />
+
+    <XmlUpdate XmlFileName="$(StageFolder)\Config\Diagnostics.config"
+      XPath="/system.diagnostics/trace/@autoflush"
+      Value="false" />
+
+    <XmlUpdate XmlFileName="$(StageFolder)\Config\Diagnostics.config"
+      XPath="/system.diagnostics/sources/source/@switchValue"
+      Value="Error" />
+
     <!-- move over extra non-content files the csproj referenced -->
     <Copy SourceFiles="@(StageProjectAlteration-ExtraFiles->'$(SrcFolder)\Orchard.Web\%(Identity)')" 
         DestinationFolder="$(StageFolder)\%(RecursiveDir)"/>

src/Orchard.Web/Modules/Orchard.Roles/Services/RolesBasedAuthorizationService.cs

@@ -84,6 +84,8 @@ namespace Orchard.Roles.Services {
 
                 context.Adjusted = false;
                 _authorizationServiceEventHandler.Adjust(context);
+                if (!context.Adjusted)
+                    break;
             }
 
             _authorizationServiceEventHandler.Complete(context);

src/Orchard/Security/IAuthorizationServiceEventHandler.cs

@@ -13,7 +13,12 @@ namespace Orchard.Security {
         public Permission Permission { get; set; }
         public IUser User { get; set; }
         public IContent Content { get; set; }
+        
+        // true if the permission has been granted to the user.
         public bool Granted { get; set; }
+        
+        // if context.Permission was modified during an Adjust(context) in an event handler, Adjusted should be set to true.
+        // It means that the permission check will be done again by the framework.
         public bool Adjusted { get; set; }
     }
 }