From cf9fad89adbf049b920947a1956e87aef5decd82 Mon Sep 17 00:00:00 2001
From: slace <unknown@kiln.example.com>
Date: Thu, 3 Dec 2009 10:07:39 +0000
Subject: [PATCH] DO NOT DOWNLOAD. DOWNLOAD LATEST STABLE FROM RELEASE TAB
 better log cleaning to not mess up the audit trail

[TFS Changeset #61971]
---
 umbraco/businesslogic/Log.cs                                  | 2 +-
 umbraco/presentation/umbraco.presentation.csproj              | 4 ++--
 ...eb.config.APOWELL-XP.xslt => web.config.APOWELL-WIN7.xslt} | 0
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename umbraco/presentation/{web.config.APOWELL-XP.xslt => web.config.APOWELL-WIN7.xslt} (100%)

diff --git a/umbraco/businesslogic/Log.cs b/umbraco/businesslogic/Log.cs
index 051d96fe9d..18ca3ed1e2 100644
--- a/umbraco/businesslogic/Log.cs
+++ b/umbraco/businesslogic/Log.cs
@@ -375,7 +375,7 @@ namespace umbraco.BusinessLogic
             try
             {
                 DateTime oldestPermittedLogEntry = DateTime.Now.Subtract(new TimeSpan(0, maximumAgeOfLogsInMinutes, 0));
-                SqlHelper.ExecuteNonQuery("delete from umbracoLog where datestamp < @oldestPermittedLogEntry",
+                SqlHelper.ExecuteNonQuery("delete from umbracoLog where datestamp < @oldestPermittedLogEntry and logHeader in ('open','system')",
                     SqlHelper.CreateParameter("@oldestPermittedLogEntry", oldestPermittedLogEntry));
                 Add(LogTypes.System, -1, "Log scrubbed.  Removed all items older than " + oldestPermittedLogEntry);
             }
diff --git a/umbraco/presentation/umbraco.presentation.csproj b/umbraco/presentation/umbraco.presentation.csproj
index 2f8586b553..f1fbca90b0 100644
--- a/umbraco/presentation/umbraco.presentation.csproj
+++ b/umbraco/presentation/umbraco.presentation.csproj
@@ -1,6 +1,6 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
-    <ProductVersion>9.0.21022</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{651E1350-91B6-44B7-BD60-7207006D7003}</ProjectGuid>
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
@@ -2671,7 +2671,7 @@
     </None>
     <None Include="umbraco_client\CodeMirror\LICENSE" />
     <None Include="Web References\org.umbraco.update\checkforupgrade.disco" />
-    <Content Include="web.config.APOWELL-XP.xslt" />
+    <Content Include="web.config.APOWELL-WIN7.xslt" />
     <Content Include="web.config.BOMBER.xslt" />
     <Content Include="web.config.SONIC.xslt" />
     <Content Include="web.STANDARD.config" />
diff --git a/umbraco/presentation/web.config.APOWELL-XP.xslt b/umbraco/presentation/web.config.APOWELL-WIN7.xslt
similarity index 100%
rename from umbraco/presentation/web.config.APOWELL-XP.xslt
rename to umbraco/presentation/web.config.APOWELL-WIN7.xslt