Merge branch '7.0.2' into 7.1.0

Shazwazza · Shazwazza · commit de6e0dc8d79a · 2014-01-24T12:32:07.000+11:00
diff --git a/src/Umbraco.Core/Models/ContentExtensions.cs b/src/Umbraco.Core/Models/ContentExtensions.cs
@@ -618,7 +618,7 @@ public static void RemoveTags(this IContentBase content, string propertyTypeAlia
         /// <returns>Xml representation of the passed in <see cref="IContent"/></returns>
         internal static XElement ToDeepXml(this IContent content)
         {
-            return ApplicationContext.Current.Services.PackagingService.Export(content, true);
+            return ApplicationContext.Current.Services.PackagingService.Export(content, true, raiseEvents: false);
         }
 
         /// <summary>
@@ -628,7 +628,7 @@ internal static XElement ToDeepXml(this IContent content)
         /// <returns>Xml representation of the passed in <see cref="IContent"/></returns>
         public static XElement ToXml(this IContent content)
         {
-            return ApplicationContext.Current.Services.PackagingService.Export(content);
+            return ApplicationContext.Current.Services.PackagingService.Export(content, raiseEvents: false);
         }
 
         /// <summary>
@@ -638,7 +638,7 @@ public static XElement ToXml(this IContent content)
         /// <returns>Xml representation of the passed in <see cref="IContent"/></returns>
         public static XElement ToXml(this IMedia media)
         {
-            return ApplicationContext.Current.Services.PackagingService.Export(media);
+            return ApplicationContext.Current.Services.PackagingService.Export(media, raiseEvents: false);
         }
 
         /// <summary>
@@ -648,7 +648,7 @@ public static XElement ToXml(this IMedia media)
         /// <returns>Xml representation of the passed in <see cref="IMedia"/></returns>
         internal static XElement ToDeepXml(this IMedia media)
         {
-            return ApplicationContext.Current.Services.PackagingService.Export(media, true);
+            return ApplicationContext.Current.Services.PackagingService.Export(media, true, raiseEvents: false);
         }
        
         /// <summary>
diff --git a/src/Umbraco.Core/Services/PackagingService.cs b/src/Umbraco.Core/Services/PackagingService.cs
@@ -1345,7 +1345,6 @@ internal XElement Export(IMember member)
 
             xml.Add(new XAttribute("loginName", member.Username));
             xml.Add(new XAttribute("email", member.Email));
-            xml.Add(new XAttribute("key", member.Key));
 
             return xml;
         }

Original file line number	Diff line number	Diff line change
`@@ -618,7 +618,7 @@ public static void RemoveTags(this IContentBase content, string propertyTypeAlia`
`618`	`618`	`/// <returns>Xml representation of the passed in <see cref="IContent"/></returns>`
`619`	`619`	`internal static XElement ToDeepXml(this IContent content)`
`620`	`620`	`{`
`621`		`- return ApplicationContext.Current.Services.PackagingService.Export(content, true);`
	`621`	`+ return ApplicationContext.Current.Services.PackagingService.Export(content, true, raiseEvents: false);`
`622`	`622`	`}`
`623`	`623`
`624`	`624`	`/// <summary>`
`@@ -628,7 +628,7 @@ internal static XElement ToDeepXml(this IContent content)`
`628`	`628`	`/// <returns>Xml representation of the passed in <see cref="IContent"/></returns>`
`629`	`629`	`public static XElement ToXml(this IContent content)`
`630`	`630`	`{`
`631`		`- return ApplicationContext.Current.Services.PackagingService.Export(content);`
	`631`	`+ return ApplicationContext.Current.Services.PackagingService.Export(content, raiseEvents: false);`
`632`	`632`	`}`
`633`	`633`
`634`	`634`	`/// <summary>`
`@@ -638,7 +638,7 @@ public static XElement ToXml(this IContent content)`
`638`	`638`	`/// <returns>Xml representation of the passed in <see cref="IContent"/></returns>`
`639`	`639`	`public static XElement ToXml(this IMedia media)`
`640`	`640`	`{`
`641`		`- return ApplicationContext.Current.Services.PackagingService.Export(media);`
	`641`	`+ return ApplicationContext.Current.Services.PackagingService.Export(media, raiseEvents: false);`
`642`	`642`	`}`
`643`	`643`
`644`	`644`	`/// <summary>`
`@@ -648,7 +648,7 @@ public static XElement ToXml(this IMedia media)`
`648`	`648`	`/// <returns>Xml representation of the passed in <see cref="IMedia"/></returns>`
`649`	`649`	`internal static XElement ToDeepXml(this IMedia media)`
`650`	`650`	`{`
`651`		`- return ApplicationContext.Current.Services.PackagingService.Export(media, true);`
	`651`	`+ return ApplicationContext.Current.Services.PackagingService.Export(media, true, raiseEvents: false);`
`652`	`652`	`}`
`653`	`653`
`654`	`654`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -1345,7 +1345,6 @@ internal XElement Export(IMember member)`
`1345`	`1345`
`1346`	`1346`	`xml.Add(new XAttribute("loginName", member.Username));`
`1347`	`1347`	`xml.Add(new XAttribute("email", member.Email));`
`1348`		`- xml.Add(new XAttribute("key", member.Key));`
`1349`	`1348`
`1350`	`1349`	`return xml;`
`1351`	`1350`	`}`