Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent

Conflicts: src/Umbraco.Web/Umbraco.Web.csproj src/Umbraco.Web/umbraco.presentation/macro.cs
2013-09-29 16:05:52 +02:00
parent 53c753b8d9 a7603747a6
commit 928f7a1ed0
16 changed files with 259 additions and 136 deletions
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
+++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
@@ -528,6 +528,9 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
 				{
 				    IPublishedProperty property;

+                    // must ignore that one
+				    if (i.Key == "version") continue;
+
                    if (i.Key.InvariantStartsWith("__"))
 				    {
                        // no type for that one, dunno how to convert