diff --git a/umbraco/cms/businesslogic/skinning/tasks/AddStyleSheetToTemplate.cs b/umbraco/cms/businesslogic/skinning/tasks/AddStyleSheetToTemplate.cs index 3e351cf07c..1aac8a2b2e 100644 --- a/umbraco/cms/businesslogic/skinning/tasks/AddStyleSheetToTemplate.cs +++ b/umbraco/cms/businesslogic/skinning/tasks/AddStyleSheetToTemplate.cs @@ -110,7 +110,7 @@ namespace umbraco.cms.businesslogic.skinning.tasks ClientSideGetValueScript, ClientSidePreviewEventType, string.IsNullOrEmpty(Media) ? "" : string.Format("media :'{0}',",Media), - new Guid().ToString().Replace("-", "")); + Guid.NewGuid().ToString().Replace("-", "")); } } } diff --git a/umbraco/cms/businesslogic/skinning/tasks/ModifyCss.cs b/umbraco/cms/businesslogic/skinning/tasks/ModifyCss.cs index cfa48d293e..36209a7b9a 100644 --- a/umbraco/cms/businesslogic/skinning/tasks/ModifyCss.cs +++ b/umbraco/cms/businesslogic/skinning/tasks/ModifyCss.cs @@ -61,7 +61,7 @@ namespace umbraco.cms.businesslogic.skinning.tasks Value, ClientSideGetValueScript, ClientSidePreviewEventType, - new Guid().ToString().Replace("-", "")); + Guid.NewGuid().ToString().Replace("-", "")); } } } diff --git a/umbraco/cms/businesslogic/skinning/tasks/ModifyTemplate.cs b/umbraco/cms/businesslogic/skinning/tasks/ModifyTemplate.cs index 530bdc35a4..630afc6191 100644 --- a/umbraco/cms/businesslogic/skinning/tasks/ModifyTemplate.cs +++ b/umbraco/cms/businesslogic/skinning/tasks/ModifyTemplate.cs @@ -69,6 +69,7 @@ namespace umbraco.cms.businesslogic.skinning.tasks public override string PreviewClientScript(string ControlClientId,string ClientSidePreviewEventType, string ClientSideGetValueScript) { + if (string.IsNullOrEmpty(TargetAttribute)) { return string.Format( @@ -86,7 +87,7 @@ namespace umbraco.cms.businesslogic.skinning.tasks TargetID, ClientSideGetValueScript, ClientSidePreviewEventType, - new Guid().ToString().Replace("-","")); + Guid.NewGuid().ToString().Replace("-", "")); } else { @@ -107,7 +108,7 @@ namespace umbraco.cms.businesslogic.skinning.tasks TargetAttribute, ClientSideGetValueScript, ClientSidePreviewEventType, - new Guid().ToString().Replace("-", "")); + Guid.NewGuid().ToString().Replace("-", "")); } } }