diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index 3c65f6f145..68f79d4a9a 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -33,8 +33,8 @@
-
-
+
+
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 8ba327c9c9..2e8fc0fd39 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -49,8 +49,9 @@
..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll
-
- ..\packages\ImageProcessor.2.5.1\lib\net45\ImageProcessor.dll
+
+ ..\packages\ImageProcessor.2.5.2\lib\net45\ImageProcessor.dll
+ True
..\packages\log4net-mediumtrust.2.0.0\lib\log4net.dll
diff --git a/src/Umbraco.Core/packages.config b/src/Umbraco.Core/packages.config
index 221e4063f6..01a4d71f82 100644
--- a/src/Umbraco.Core/packages.config
+++ b/src/Umbraco.Core/packages.config
@@ -2,7 +2,7 @@
-
+
diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 55b6c3c671..019feff513 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -134,11 +134,12 @@
False
..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll
-
- ..\packages\ImageProcessor.2.5.1\lib\net45\ImageProcessor.dll
+
+ ..\packages\ImageProcessor.2.5.2\lib\net45\ImageProcessor.dll
+ True
-
- ..\packages\ImageProcessor.Web.4.8.0\lib\net45\ImageProcessor.Web.dll
+
+ ..\packages\ImageProcessor.Web.4.8.2\lib\net45\ImageProcessor.Web.dll
True
@@ -167,7 +168,8 @@
- ..\packages\Microsoft.IO.RecyclableMemoryStream.1.2.0\lib\net45\Microsoft.IO.RecyclableMemoryStream.dll
+ ..\packages\Microsoft.IO.RecyclableMemoryStream.1.2.1\lib\net45\Microsoft.IO.RecyclableMemoryStream.dll
+ True
..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll
diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config
index 1ea477f5cb..ce3ef29c96 100644
--- a/src/Umbraco.Web.UI/packages.config
+++ b/src/Umbraco.Web.UI/packages.config
@@ -5,8 +5,8 @@
-
-
+
+
@@ -22,7 +22,7 @@
-
+
diff --git a/src/Umbraco.Web/Cache/PageCacheRefresher.cs b/src/Umbraco.Web/Cache/PageCacheRefresher.cs
index 75118a6748..fc6e0c8d20 100644
--- a/src/Umbraco.Web/Cache/PageCacheRefresher.cs
+++ b/src/Umbraco.Web/Cache/PageCacheRefresher.cs
@@ -74,7 +74,7 @@ namespace Umbraco.Web.Cache
public override void Remove(int id)
{
ApplicationContext.Current.ApplicationCache.ClearPartialViewCache();
- content.Instance.ClearDocumentCache(id);
+ content.Instance.ClearDocumentCache(id, false);
DistributedCache.Instance.ClearAllMacroCacheOnCurrentServer();
DistributedCache.Instance.ClearXsltCacheOnCurrentServer();
ClearAllIsolatedCacheByEntityType();
@@ -95,7 +95,7 @@ namespace Umbraco.Web.Cache
public override void Remove(IContent instance)
{
ApplicationContext.Current.ApplicationCache.ClearPartialViewCache();
- content.Instance.ClearDocumentCache(new Document(instance));
+ content.Instance.ClearDocumentCache(new Document(instance), false);
XmlPublishedContent.ClearRequest();
DistributedCache.Instance.ClearAllMacroCacheOnCurrentServer();
DistributedCache.Instance.ClearXsltCacheOnCurrentServer();
diff --git a/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs b/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
index fd36d8e4e6..85dd58d697 100644
--- a/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
+++ b/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
@@ -81,7 +81,7 @@ namespace Umbraco.Web.Install.InstallSteps
{
var client = new System.Net.WebClient();
var values = new NameValueCollection { { "name", admin.Name }, { "email", admin.Email} };
- client.UploadValues("https://umbraco.com/base/Ecom/SubmitEmail/installer.aspx", values);
+ client.UploadValues("https://shop.umbraco.com/base/Ecom/SubmitEmail/installer.aspx", values);
}
catch { /* fail in silence */ }
}
@@ -147,4 +147,4 @@ namespace Umbraco.Web.Install.InstallSteps
}
}
}
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/umbraco.presentation/content.cs b/src/Umbraco.Web/umbraco.presentation/content.cs
index 00d1984d12..a7c5a75337 100644
--- a/src/Umbraco.Web/umbraco.presentation/content.cs
+++ b/src/Umbraco.Web/umbraco.presentation/content.cs
@@ -394,6 +394,11 @@ namespace umbraco
}
public virtual void ClearDocumentCache(int documentId)
+ {
+ ClearDocumentCache(documentId, true);
+ }
+
+ internal virtual void ClearDocumentCache(int documentId, bool removeDbXmlEntry)
{
// Get the document
Document d;
@@ -408,7 +413,7 @@ namespace umbraco
ClearDocumentXmlCache(documentId);
return;
}
- ClearDocumentCache(d);
+ ClearDocumentCache(d, removeDbXmlEntry);
}
///
@@ -416,7 +421,8 @@ namespace umbraco
/// This means the node gets unpublished from the website.
///
/// The document
- internal void ClearDocumentCache(Document doc)
+ ///
+ internal void ClearDocumentCache(Document doc, bool removeDbXmlEntry)
{
var e = new DocumentCacheEventArgs();
FireBeforeClearDocumentCache(doc, e);
@@ -425,8 +431,13 @@ namespace umbraco
{
XmlNode x;
- // remove from xml db cache
- doc.XmlRemoveFromDB();
+ //Hack: this is here purely for backwards compat if someone for some reason is using the
+ // ClearDocumentCache(int documentId) method and expecting it to remove the xml
+ if (removeDbXmlEntry)
+ {
+ // remove from xml db cache
+ doc.XmlRemoveFromDB();
+ }
// clear xml cache
ClearDocumentXmlCache(doc.Id);