From 6f64e480dfde3dc23f9b9102e1f09b1172df86c7 Mon Sep 17 00:00:00 2001
From: abutland <unknown@kiln.example.com>
Date: Sun, 19 Aug 2012 18:28:13 -0200
Subject: [PATCH 1/6] U4-53: auto selections of allowed/default templates  -
 set default on selection of allow template if not already set  - de-select
 default template if template set as not allowed  - select allowed template if
 default template selected

---
 .../umbraco/settings/EditNodeTypeNew.aspx     | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/src/Umbraco.Web.UI/umbraco/settings/EditNodeTypeNew.aspx b/src/Umbraco.Web.UI/umbraco/settings/EditNodeTypeNew.aspx
index c708ea4f31..73975e64f2 100644
--- a/src/Umbraco.Web.UI/umbraco/settings/EditNodeTypeNew.aspx
+++ b/src/Umbraco.Web.UI/umbraco/settings/EditNodeTypeNew.aspx
@@ -3,6 +3,39 @@
 
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="uc1" TagName="ContentTypeControlNew" Src="../controls/ContentTypeControlNew.ascx" %>
+
+<asp:Content ContentPlaceHolderID="head" runat="server">
+    <script type="text/javascript">
+        jQuery(document).ready(function () {
+
+            // Auto selection/de-selection of default template based on allow templates
+            jQuery("#<%= templateList.ClientID %> input[type='checkbox']").on("change", function () {
+                var checkbox = jQuery(this);
+                var ddl = jQuery("#<%= ddlTemplates.ClientID %>");
+                // If default template is not set, and an allowed template is selected, auto-select the default template
+                if (checkbox.is(":checked")) {
+                    if (ddl.val() == "0") {
+                        ddl.val(checkbox.val());
+                    }
+                } else {
+                    // If allowed template has been de-selected, and it's selected as the default, then de-select the default template
+                    if (ddl.val() == checkbox.val()) {
+                        ddl.val("0");
+                    }
+                }
+            });
+
+            // Auto selection allowed template based on default template
+            jQuery("#<%= ddlTemplates.ClientID %>").on("change", function () {
+                var ddl = jQuery(this);
+                if (ddl.val() != "0") {
+                    jQuery("#<%= templateList.ClientID %> input[type='checkbox'][value='" + ddl.val() + "']").prop("checked", true);
+                }
+            });
+        });
+    </script>
+</asp:Content>
+
 <asp:Content ContentPlaceHolderID="body" runat="server">
     <uc1:ContentTypeControlNew ID="ContentTypeControlNew1" runat="server"></uc1:ContentTypeControlNew>
     <cc1:Pane ID="tmpPane" runat="server">

From 1118e1e3fda432a44b083db551bbc85d23f2f467 Mon Sep 17 00:00:00 2001
From: sebastiaan <unknown@kiln.example.com>
Date: Sun, 2 Sep 2012 16:17:12 -0200
Subject: [PATCH 2/6] Have to duplicate previous fix in the Umbraco.Web project
 as Umbraco.Web.UI gets overwritten with it

---
 .../umbraco/settings/EditNodeTypeNew.aspx     | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditNodeTypeNew.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditNodeTypeNew.aspx
index c708ea4f31..73975e64f2 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditNodeTypeNew.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditNodeTypeNew.aspx
@@ -3,6 +3,39 @@
 
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="uc1" TagName="ContentTypeControlNew" Src="../controls/ContentTypeControlNew.ascx" %>
+
+<asp:Content ContentPlaceHolderID="head" runat="server">
+    <script type="text/javascript">
+        jQuery(document).ready(function () {
+
+            // Auto selection/de-selection of default template based on allow templates
+            jQuery("#<%= templateList.ClientID %> input[type='checkbox']").on("change", function () {
+                var checkbox = jQuery(this);
+                var ddl = jQuery("#<%= ddlTemplates.ClientID %>");
+                // If default template is not set, and an allowed template is selected, auto-select the default template
+                if (checkbox.is(":checked")) {
+                    if (ddl.val() == "0") {
+                        ddl.val(checkbox.val());
+                    }
+                } else {
+                    // If allowed template has been de-selected, and it's selected as the default, then de-select the default template
+                    if (ddl.val() == checkbox.val()) {
+                        ddl.val("0");
+                    }
+                }
+            });
+
+            // Auto selection allowed template based on default template
+            jQuery("#<%= ddlTemplates.ClientID %>").on("change", function () {
+                var ddl = jQuery(this);
+                if (ddl.val() != "0") {
+                    jQuery("#<%= templateList.ClientID %> input[type='checkbox'][value='" + ddl.val() + "']").prop("checked", true);
+                }
+            });
+        });
+    </script>
+</asp:Content>
+
 <asp:Content ContentPlaceHolderID="body" runat="server">
     <uc1:ContentTypeControlNew ID="ContentTypeControlNew1" runat="server"></uc1:ContentTypeControlNew>
     <cc1:Pane ID="tmpPane" runat="server">

From 09184041b72ff8e83eaa29265f2dae84ba78777f Mon Sep 17 00:00:00 2001
From: "tom.fulton@Tom-PC.imulus.local" <unknown@kiln.example.com>
Date: Fri, 31 Aug 2012 02:48:55 +0600
Subject: [PATCH 3/6] Fix U4-722 - Feature: Add TinyMCE email address detection
 (mailto)

---
 .../umbraco/plugins/tinymce3/insertLink.aspx             | 2 +-
 .../tinymce3/plugins/umbracolink/js/umbracolink.js       | 3 ---
 .../umbraco/plugins/tinymce3/insertLink.aspx             | 2 +-
 .../umbraco/plugins/tinymce3/insertLink.aspx.designer.cs | 9 +++++++++
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Web.UI/umbraco/plugins/tinymce3/insertLink.aspx b/src/Umbraco.Web.UI/umbraco/plugins/tinymce3/insertLink.aspx
index 1fd95d287d..24de8c77b9 100644
--- a/src/Umbraco.Web.UI/umbraco/plugins/tinymce3/insertLink.aspx
+++ b/src/Umbraco.Web.UI/umbraco/plugins/tinymce3/insertLink.aspx
@@ -18,7 +18,7 @@
 	<umb:JsInclude ID="JsInclude1" runat="server" FilePath="tinymce3/tiny_mce_popup.js" PathNameAlias="UmbracoClient" Priority="100" />
 	<umb:JsInclude ID="JsInclude3" runat="server" FilePath="tinymce3/plugins/umbracolink/js/umbracolink.js" PathNameAlias="UmbracoClient" Priority="101" />
 	<umb:JsInclude ID="JsInclude4" runat="server" FilePath="tinymce3/utils/form_utils.js" PathNameAlias="UmbracoClient" Priority="102" />
-
+    <umb:JsInclude ID="JsInclude5" runat="server" FilePath="tinymce3/utils/validate.js" PathNameAlias="UmbracoClient" Priority="103" />
    
 
     <script type="text/javascript" language="javascript">
diff --git a/src/Umbraco.Web.UI/umbraco_client/tinymce3/plugins/umbracolink/js/umbracolink.js b/src/Umbraco.Web.UI/umbraco_client/tinymce3/plugins/umbracolink/js/umbracolink.js
index ca6a3a17c2..f2c540ea60 100644
--- a/src/Umbraco.Web.UI/umbraco_client/tinymce3/plugins/umbracolink/js/umbracolink.js
+++ b/src/Umbraco.Web.UI/umbraco_client/tinymce3/plugins/umbracolink/js/umbracolink.js
@@ -146,11 +146,8 @@ function init() {
 }
 
 function checkPrefix(n) {
-	/* UMBRACO SPECIFIC
 	if (n.value && Validator.isEmail(n) && !/^\s*mailto:/i.test(n.value) && confirm(tinyMCEPopup.getLang('advlink_dlg.is_email')))
 		n.value = 'mailto:' + n.value;
-	* EO UMBRACO SPECIFIC
-	*/	
 
 	if (/^\s*www\./i.test(n.value) && confirm(tinyMCEPopup.getLang('advlink_dlg.is_external')))
 		n.value = 'http://' + n.value;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertLink.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertLink.aspx
index 1fd95d287d..24de8c77b9 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertLink.aspx
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertLink.aspx
@@ -18,7 +18,7 @@
 	<umb:JsInclude ID="JsInclude1" runat="server" FilePath="tinymce3/tiny_mce_popup.js" PathNameAlias="UmbracoClient" Priority="100" />
 	<umb:JsInclude ID="JsInclude3" runat="server" FilePath="tinymce3/plugins/umbracolink/js/umbracolink.js" PathNameAlias="UmbracoClient" Priority="101" />
 	<umb:JsInclude ID="JsInclude4" runat="server" FilePath="tinymce3/utils/form_utils.js" PathNameAlias="UmbracoClient" Priority="102" />
-
+    <umb:JsInclude ID="JsInclude5" runat="server" FilePath="tinymce3/utils/validate.js" PathNameAlias="UmbracoClient" Priority="103" />
    
 
     <script type="text/javascript" language="javascript">
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertLink.aspx.designer.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertLink.aspx.designer.cs
index 3047908b96..c3fc0b59ef 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertLink.aspx.designer.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertLink.aspx.designer.cs
@@ -66,6 +66,15 @@ namespace umbraco.presentation.plugins.tinymce3 {
         /// </remarks>
         protected global::ClientDependency.Core.Controls.JsInclude JsInclude4;
         
+        /// <summary>
+        /// JsInclude5 control.
+        /// </summary>
+        /// <remarks>
+        /// Auto-generated field.
+        /// To modify move field declaration from designer file to code-behind file.
+        /// </remarks>
+        protected global::ClientDependency.Core.Controls.JsInclude JsInclude5;
+        
         /// <summary>
         /// pane_url control.
         /// </summary>

From f9a33b5471d2928a4a7223220bfd47963aa2d29b Mon Sep 17 00:00:00 2001
From: Dallas taylor <dallastaylor@gmail.com>
Date: Fri, 3 Aug 2012 06:10:16 +0400
Subject: [PATCH 4/6] Removed logging of the publish event from the
 presentation. The event is also logged in the publishWithResult() method, and
 was causing the Publish event to appear twice in the Audit Trail.

---
 src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs
index 1f50ddff3b..442127018b 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs
@@ -317,7 +317,6 @@ namespace umbraco.cms.presentation
                         ClientTools.ShowSpeechBubble(speechBubbleIcon.save, ui.Text("speechBubbles", "editContentPublishedHeader", null), ui.Text("speechBubbles", "editContentPublishedText", null));
                         library.UpdateDocumentCache(_document.Id);
 
-                        BusinessLogic.Log.Add(BusinessLogic.LogTypes.Publish, base.getUser(), _document.Id, "");
                         littPublishStatus.Text = ui.Text("content", "lastPublished", base.getUser()) + ": " + _document.VersionDate.ToString() + "<br/>";
 
                         if (base.getUser().GetPermissions(_document.Path).IndexOf("U") > -1)

From 6e77a0900818d735691a853532d9ee0bce81ed3d Mon Sep 17 00:00:00 2001
From: scarta <unknown@kiln.example.com>
Date: Wed, 14 Sep 2011 12:47:08 -0100
Subject: [PATCH 5/6] Issue 30472 - Fixed exception where 'Item has already
 been added...' is thrown during
 umbraco.controls.ContentControl.CreateChildControls. ContentTypes are cached,
 but contain a lazily-loaded list which could potentially be populated twice
 by two separate requests.

---
 src/umbraco.cms/businesslogic/ContentType.cs | 37 +++++++++++++-------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/umbraco.cms/businesslogic/ContentType.cs b/src/umbraco.cms/businesslogic/ContentType.cs
index c2d96a7bfe..6b83201bd5 100644
--- a/src/umbraco.cms/businesslogic/ContentType.cs
+++ b/src/umbraco.cms/businesslogic/ContentType.cs
@@ -316,7 +316,7 @@ namespace umbraco.cms.businesslogic
         /// </summary>
         public bool IsContainerContentType
         {
-            get { return _isContainerContentType; } 
+            get { return _isContainerContentType; }
             set
             {
                 _isContainerContentType = value;
@@ -324,7 +324,7 @@ namespace umbraco.cms.businesslogic
                                           "update cmsContentType set isContainerContentType = @isContainerContentType where nodeId = @id",
                                           SqlHelper.CreateParameter("@isContainerContentType", value),
                                           SqlHelper.CreateParameter("@id", Id));
-            } 
+            }
         }
 
         /// <summary>
@@ -962,25 +962,38 @@ namespace umbraco.cms.businesslogic
         }
 
 
-
+        private readonly object _virtualTabLoadLock = new object();
         /// <summary>
         /// Checks if we've loaded the virtual tabs into memory and if not gets them from the databse.
         /// </summary>
         private void EnsureVirtualTabs()
         {
-            //optimize, lazy load the data only one time
+            // This class can be cached and potentially shared between multiple threads.
+            // Two or more threads can attempt to lazyily-load its virtual tabs at the same time.
+            // If that happens, the m_VirtualTabs will contain duplicates.
+            // We must prevent two threads from running InitializeVirtualTabs at the same time.
+            // We must also prevent m_VirtualTabs from being modified while it is being populated.
             if (m_VirtualTabs == null || m_VirtualTabs.Count == 0)
             {
-                InitializeVirtualTabs();
+                lock (_virtualTabLoadLock)
+                {
+                    //optimize, lazy load the data only one time
+                    if (m_VirtualTabs == null || m_VirtualTabs.Count == 0)
+                    {
+                        InitializeVirtualTabs();
+                    }
+                }
             }
         }
 
+
         /// <summary>
         /// Loads the tabs into memory from the database and stores them in a local list for retreival
         /// </summary>
         private void InitializeVirtualTabs()
         {
-            m_VirtualTabs = new List<TabI>();
+            // While we are initialising, we should not use the class-scoped list, as it may be used by other threads
+            var temporaryList = new List<TabI>();
             using (IRecordsReader dr = SqlHelper.ExecuteReader(
                                                               string.Format(
                                                                   "Select Id,text,sortOrder from cmsTab where contenttypeNodeId = {0} order by sortOrder",
@@ -988,21 +1001,21 @@ namespace umbraco.cms.businesslogic
             {
                 while (dr.Read())
                 {
-                    m_VirtualTabs.Add(new Tab(dr.GetInt("id"), dr.GetString("text"), dr.GetInt("sortOrder"), this));
+                    temporaryList.Add(new Tab(dr.GetInt("id"), dr.GetString("text"), dr.GetInt("sortOrder"), this));
                 }
             }
 
             // Master Content Type
             if (MasterContentType != 0)
             {
-                foreach (TabI t in ContentType.GetContentType(MasterContentType).getVirtualTabs.ToList())
-                {
-                    m_VirtualTabs.Add(t);
-                }
+                temporaryList.AddRange(GetContentType(MasterContentType).getVirtualTabs.ToList());
             }
 
             // sort all tabs
-            m_VirtualTabs.Sort((a, b) => a.SortOrder.CompareTo(b.SortOrder));
+            temporaryList.Sort((a, b) => a.SortOrder.CompareTo(b.SortOrder));
+
+            // now that we aren't going to modify the list, we can set it to the class-scoped variable.
+            m_VirtualTabs = temporaryList;
         }
 
         private void populateMasterContentTypes(PropertyType pt, int docTypeId)

From 67c1435fb07d3698763333f2302fe22096f9f5ef Mon Sep 17 00:00:00 2001
From: janusschmidtDK <unknown@kiln.example.com>
Date: Fri, 31 Aug 2012 10:43:14 -0200
Subject: [PATCH 6/6] Fix for U4-727 - Small performance issue in backend when
 loading stylesheet properties.

---
 src/umbraco.cms/businesslogic/web/StyleSheet.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/umbraco.cms/businesslogic/web/StyleSheet.cs b/src/umbraco.cms/businesslogic/web/StyleSheet.cs
index 7969b34ee1..c14f7ab603 100644
--- a/src/umbraco.cms/businesslogic/web/StyleSheet.cs
+++ b/src/umbraco.cms/businesslogic/web/StyleSheet.cs
@@ -59,7 +59,7 @@ namespace umbraco.cms.businesslogic.web
                     StylesheetProperty[] retVal = new StylesheetProperty[tmp.Length];
                     for (int i = 0; i < tmp.Length; i++)
                     {
-                        retVal[i] = StylesheetProperty.GetStyleSheetProperty(this.ChildrenOfAllObjectTypes[i].Id);
+                        retVal[i] = StylesheetProperty.GetStyleSheetProperty(tmp[i].Id);
                     }
                     m_properties = retVal;
                 }