Updates examine to latest version

V8: Fix "ambient scope" error when creating content template from content

.github/CONTRIBUTING.md

@@ -1,4 +1,4 @@
-_Looking for Umbraco version 8? [Click here](https://github.com/umbraco/Umbraco-CMS/blob/temp8/.github/V8_GETTING_STARTED.md) to go to the v8 branch_
+_Looking for Umbraco version 8? [Click here](https://github.com/umbraco/Umbraco-CMS/blob/dev-v8/.github/V8_GETTING_STARTED.md) to go to the v8 branch_
 # Contributing to Umbraco CMS
 
 👍🎉 First off, thanks for taking the time to contribute! 🎉👍

.github/README.md

@@ -1,7 +1,9 @@
-_You are browsing the Umbraco v8 branch. Umbraco 8 is currently under development._
-[![pullreminders](https://pullreminders.com/badge.svg)](https://pullreminders.com?ref=badge)
+[![Build status](https://umbraco.visualstudio.com/Umbraco%20Cms/_apis/build/status/Cms%208%20Continuous?branchName=dev-v8)](https://umbraco.visualstudio.com/Umbraco%20Cms/_build?definitionId=75) [![pullreminders](https://pullreminders.com/badge.svg)](https://pullreminders.com?ref=badge)
 
-_Looking for Umbraco version 7? [Click here](https://github.com/umbraco/Umbraco-CMS) to go to the v7 branch._
+
+_You are browsing the Umbraco v8 branch. Umbraco 8 is currently under development._
+
+_Looking for Umbraco version 7? [Click here](https://github.com/umbraco/Umbraco-CMS/tree/dev-v7) to go to the v7 branch._
 
 _Ready to try out Version 8? [See the quick start guide](V8_GETTING_STARTED.md)._
 

.github/V8_GETTING_STARTED.md

@@ -5,7 +5,7 @@
 * [Visual Studio 2017 Community (Free)](https://www.visualstudio.com/vs/community/), or Professional, Enterprise, etc... _(**Minimum of Version 15.7** or higher, this is important, you WILL get issues with lesser versions)_
 * .NET Framework 4.7.2 installed, get it here: https://www.microsoft.com/net/download/thank-you/net472?survey=false
 * .NET Framework 4.7.2 developer pack, get it here: https://www.microsoft.com/net/download/thank-you/net472-developer-pack _(be sure this is the ENU file which will be named `NDP472-DevPack-ENU.exe`)_
-* Clone the Umbraco repository using the `temp8` branch. If your git client doesn't support specifying the branch as you clone then use the command `git clone --single-branch -b temp8 <your fork url>`. _(If you clone the repo using the default v7 branch and then checkout the `temp8` branch you **might** get problems)_
+* Clone the Umbraco repository using the `dev-v8` branch. If your git client doesn't support specifying the branch as you clone then use the command `git clone --single-branch -b dev-v8 <your fork url>`. _(If you clone the repo using the default v7 branch and then checkout the `dev-v8` branch you **might** get problems)_
 
 ### Start the solution
 

build/NuSpecs/UmbracoCms.Web.nuspec

@@ -27,7 +27,7 @@
                 <dependency id="ClientDependency" version="[1.9.7,1.999999)" />
                 <dependency id="ClientDependency-Mvc5" version="[1.8.0,1.999999)" />
                 <dependency id="CSharpTest.Net.Collections" version="[14.906.1403.1082,14.999999)" />
-                <dependency id="Examine" version="[1.0.0,1.999999)" />
+                <dependency id="Examine" version="[1.0.1,1.999999)" />
                 <dependency id="HtmlAgilityPack" version="[1.8.14,1.999999)" />
                 <dependency id="ImageProcessor" version="[2.7.0.100,2.999999)" />
                 <dependency id="LightInject.Mvc" version="[2.0.0,2.999999)" />

build/NuSpecs/tools/Web.config.install.xdt

@@ -126,45 +126,55 @@
       <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='Microsoft.CodeAnalysis.CSharp')" xdt:Transform="Remove" />
       <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='log4net')" xdt:Transform="Remove" />
       <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Data.SqlServerCe')" xdt:Transform="Remove" />
+      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.ValueTuple')" xdt:Transform="Remove" />
+      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http.Formatting')" xdt:Transform="Remove" />
     </assemblyBinding>
   </runtime>
 
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-        <dependentAssembly xdt:Transform="Insert">
-            <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
-        </dependentAssembly>
-        <dependentAssembly xdt:Transform="Insert">
-            <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
-        </dependentAssembly>
-        <dependentAssembly xdt:Transform="Insert">
-            <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
-        </dependentAssembly>
-        <dependentAssembly xdt:Transform="Insert">
-            <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
-        </dependentAssembly>
-        <dependentAssembly xdt:Transform="Insert">
-            <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
-        </dependentAssembly>
-        <dependentAssembly xdt:Transform="Insert">
-            <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0" />
-        </dependentAssembly>
-        <dependentAssembly xdt:Transform="Insert">
-            <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-5.2.6.0" newVersion="5.2.6.0" />
-        </dependentAssembly>
-        <dependentAssembly xdt:Transform="Insert">
-            <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-            <bindingRedirect oldVersion="0.0.0.0-5.2.6.0" newVersion="5.2.6.0" />
-        </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
+ <runtime>
+        <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="Microsoft.Owin.Security.Cookies" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="Microsoft.Owin.Security.OAuth" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-1.2.3.0" newVersion="1.2.3.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+                <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+            </dependentAssembly>
+            <dependentAssembly xdt:Transform="Insert">
+                <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" />
+                <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+            </dependentAssembly>
+        </assemblyBinding>
+    </runtime>
 
   <system.web.webPages.razor xdt:Transform="Remove" />
 

src/SolutionInfo.cs

@@ -18,5 +18,5 @@ using System.Resources;
 [assembly: AssemblyVersion("8.0.0")]
 
 // these are FYI and changed automatically
-[assembly: AssemblyFileVersion("8.0.0")]
-[assembly: AssemblyInformationalVersion("8.0.0")]
+[assembly: AssemblyFileVersion("8.1.0")]
+[assembly: AssemblyInformationalVersion("8.1.0")]

src/Umbraco.Core/Composing/ComponentCollectionBuilder.cs

@@ -30,7 +30,7 @@ namespace Umbraco.Core.Composing
 
         protected override IComponent CreateItem(IFactory factory, Type itemType)
         {
-            using (_logger.DebugDuration<Composers>($"Creating {itemType.FullName}.", $"Created {itemType.FullName}.", thresholdMilliseconds: LogThresholdMilliseconds))
+            using (_logger.DebugDuration<ComponentCollectionBuilder>($"Creating {itemType.FullName}.", $"Created {itemType.FullName}.", thresholdMilliseconds: LogThresholdMilliseconds))
             {
                 return base.CreateItem(factory, itemType);
             }

src/Umbraco.Core/IO/MediaPathSchemes/CombinedGuidsMediaPathScheme.cs

@@ -8,12 +8,9 @@ namespace Umbraco.Core.IO.MediaPathSchemes
     /// </summary>
     /// <remarks>
     /// <para>Path is "{combinedGuid}/{filename}" where combinedGuid is a combination of itemGuid and propertyGuid.</para>
-    /// <para>This scheme is dangerous, as it does not prevent potential collisions.</para>
     /// </remarks>
     public class CombinedGuidsMediaPathScheme : IMediaPathScheme
     {
-        private const int DirectoryLength = 8;
-
         /// <inheritdoc />
         public string GetFilePath(IMediaFileSystem fileSystem, Guid itemGuid, Guid propertyGuid, string filename, string previous = null)
         {
@@ -21,7 +18,7 @@ namespace Umbraco.Core.IO.MediaPathSchemes
             // for a single content cannot store two different files with the same name
 
             var combinedGuid = GuidUtils.Combine(itemGuid, propertyGuid);
-            var directory = GuidUtils.ToBase32String(combinedGuid, DirectoryLength); // see also HexEncoder, we may want to fragment path eg 12/e4/f3...
+            var directory = HexEncoder.Encode(combinedGuid.ToByteArray()/*'/', 2, 4*/); // could use ext to fragment path eg 12/e4/f2/...
             return Path.Combine(directory, filename).Replace('\\', '/');
         }
 

src/Umbraco.Core/IO/MediaPathSchemes/UniqueMediaPathScheme.cs

@@ -7,7 +7,7 @@ namespace Umbraco.Core.IO.MediaPathSchemes
     /// Implements a unique directory media path scheme.
     /// </summary>
     /// <remarks>
-    /// <para>This scheme provides short paths, yet handle potential collisions.</para>
+    /// <para>This scheme provides deterministic short paths, with potential collisions.</para>
     /// </remarks>
     public class UniqueMediaPathScheme : IMediaPathScheme
     {
@@ -16,23 +16,22 @@ namespace Umbraco.Core.IO.MediaPathSchemes
         /// <inheritdoc />
         public string GetFilePath(IMediaFileSystem fileSystem, Guid itemGuid, Guid propertyGuid, string filename, string previous = null)
         {
-            string directory;
-
-            // no point "combining" guids if all we want is some random guid - just get a new one
-            // and then, because we don't want collisions, ensure that the directory does not already exist
-            // (should be quite rare, but eh...)
-
-            do
-            {
-                var combinedGuid = Guid.NewGuid();
-                directory = GuidUtils.ToBase32String(combinedGuid, DirectoryLength); // see also HexEncoder, we may want to fragment path eg 12/e4/f3...
-
-            } while (fileSystem.DirectoryExists(directory));
+            var combinedGuid = GuidUtils.Combine(itemGuid, propertyGuid);
+            var directory = GuidUtils.ToBase32String(combinedGuid, DirectoryLength);
 
             return Path.Combine(directory, filename).Replace('\\', '/');
         }
 
         /// <inheritdoc />
-        public string GetDeleteDirectory(IMediaFileSystem fileSystem, string filepath) => Path.GetDirectoryName(filepath);
+        /// <remarks>
+        /// <para>Returning null so that <see cref="MediaFileSystem.DeleteMediaFiles"/> does *not*
+        /// delete any directory. This is because the above shortening of the Guid to 8 chars
+        /// means we're increasing the risk of collision, and we don't want to delete files
+        /// belonging to other media items.</para>
+        /// <para>And, at the moment, we cannot delete directory "only if it is empty" because of
+        /// race conditions. We'd need to implement locks in <see cref="MediaFileSystem"/> for
+        /// this.</para>
+        /// </remarks>
+        public string GetDeleteDirectory(IMediaFileSystem fileSystem, string filepath) => null;
     }
-}
+}

src/Umbraco.Core/PublishedModelFactoryExtensions.cs

@@ -0,0 +1,33 @@
+using System;
+using Umbraco.Core.Models.PublishedContent;
+
+namespace Umbraco.Core
+{
+    /// <summary>
+    /// Provides extension methods for <see cref="IPublishedModelFactory"/>.
+    /// </summary>
+    public static class PublishedModelFactoryExtensions
+    {
+        /// <summary>
+        /// Executes an action with a safe live factory/
+        /// </summary>
+        /// <remarks>
+        /// <para>If the factory is a live factory, ensures it is refreshed and locked while executing the action.</para>
+        /// </remarks>
+        public static void WithSafeLiveFactory(this IPublishedModelFactory factory, Action action)
+        {
+            if (factory is ILivePublishedModelFactory liveFactory)
+            {
+                lock (liveFactory.SyncRoot)
+                {
+                    liveFactory.Refresh();
+                    action();
+                }
+            }
+            else
+            {
+                action();
+            }
+        }
+    }
+}

src/Umbraco.Core/Services/Implement/ContentService.cs

@@ -2862,7 +2862,7 @@ namespace Umbraco.Core.Services.Implement
         {
             if (blueprint == null) throw new ArgumentNullException(nameof(blueprint));
 
-            var contentType = _contentTypeRepository.Get(blueprint.ContentType.Id);
+            var contentType = GetContentType(blueprint.ContentType.Alias);
             var content = new Content(name, -1, contentType);
             content.Path = string.Concat(content.ParentId.ToString(), ",", content.Id);
 

src/Umbraco.Core/Strings/Utf8ToAsciiConverter.cs

@@ -17,7 +17,7 @@ namespace Umbraco.Core.Strings
         /// Converts an Utf8 string into an Ascii string.
         /// </summary>
         /// <param name="text">The text to convert.</param>
-        /// <param name="fail">The character to used to replace characters that cannot properly be converted.</param>
+        /// <param name="fail">The character to use to replace characters that cannot properly be converted.</param>
         /// <returns>The converted text.</returns>
         public static string ToAsciiString(string text, char fail = '?')
         {
@@ -39,7 +39,7 @@ namespace Umbraco.Core.Strings
         /// Converts an Utf8 string into an array of Ascii characters.
         /// </summary>
         /// <param name="text">The text to convert.</param>
-        /// <param name="fail">The character to used to replace characters that cannot properly be converted.</param>
+        /// <param name="fail">The character to use to replace characters that cannot properly be converted.</param>
         /// <returns>The converted text.</returns>
         public static char[] ToAsciiCharArray(string text, char fail = '?')
         {
@@ -66,7 +66,7 @@ namespace Umbraco.Core.Strings
         /// </summary>
         /// <param name="input">The input array.</param>
         /// <param name="output">The output array.</param>
-        /// <param name="fail">The character to used to replace characters that cannot properly be converted.</param>
+        /// <param name="fail">The character to use to replace characters that cannot properly be converted.</param>
         /// <returns>The number of characters in the output array.</returns>
         /// <remarks>The caller must ensure that the output array is big enough.</remarks>
         /// <exception cref="OverflowException">The output array is not big enough.</exception>
@@ -112,7 +112,7 @@ namespace Umbraco.Core.Strings
         /// <param name="ipos">The input position.</param>
         /// <param name="output">The output array.</param>
         /// <param name="opos">The output position.</param>
-        /// <param name="fail">The character to used to replace characters that cannot properly be converted.</param>
+        /// <param name="fail">The character to use to replace characters that cannot properly be converted.</param>
         /// <remarks>
         /// <para>Adapted from various sources on the 'net including <c>Lucene.Net.Analysis.ASCIIFoldingFilter</c>.</para>
         /// <para>Input should contain Utf8 characters exclusively and NOT Unicode.</para>

src/Umbraco.Core/Umbraco.Core.csproj

@@ -212,6 +212,7 @@
     <Compile Include="Models\PublishedContent\ILivePublishedModelFactory.cs" />
     <Compile Include="PropertyEditors\DateTimeConfiguration.cs" />
     <Compile Include="Migrations\Upgrade\V_8_0_0\RenameLabelAndRichTextPropertyEditorAliases.cs" />
+    <Compile Include="PublishedModelFactoryExtensions.cs" />
     <Compile Include="Services\PropertyValidationService.cs" />
     <Compile Include="TypeLoaderExtensions.cs" />
     <Compile Include="Composing\WeightAttribute.cs" />

src/Umbraco.Examine/Umbraco.Examine.csproj

@@ -48,7 +48,7 @@
   </ItemGroup>
   <ItemGroup>
     <!-- note: NuGet deals with transitive references now -->
-    <PackageReference Include="Examine" Version="1.0.0" />
+    <PackageReference Include="Examine" Version="1.0.1" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
     <PackageReference Include="NPoco" Version="3.9.4" />
   </ItemGroup>

src/Umbraco.Tests/IO/FileSystemsTests.cs

@@ -112,9 +112,19 @@ namespace Umbraco.Tests.IO
             fs.DeleteMediaFiles(new[] { virtPath });
             Assert.IsFalse(File.Exists(physPath));
 
-            // ~/media/1234 is gone
-            physPath = Path.GetDirectoryName(physPath);
-            Assert.IsFalse(Directory.Exists(physPath));
+            var scheme = Current.Factory.GetInstance<IMediaPathScheme>();
+            if (scheme is UniqueMediaPathScheme)
+            {
+                // ~/media/1234 is *not* gone
+                physPath = Path.GetDirectoryName(physPath);
+                Assert.IsTrue(Directory.Exists(physPath));
+            }
+            else
+            {
+                // ~/media/1234 is gone
+                physPath = Path.GetDirectoryName(physPath);
+                Assert.IsFalse(Directory.Exists(physPath));
+            }
 
             // ~/media exists
             physPath = Path.GetDirectoryName(physPath);

src/Umbraco.Tests/PublishedContent/NuCacheTests.cs

@@ -180,8 +180,8 @@ namespace Umbraco.Tests.PublishedContent
                 dataSource,
                 globalSettings,
                 new SiteDomainHelper(),
-                contentTypeServiceBaseFactory,
-                Mock.Of<IEntityXmlSerializer>());
+                Mock.Of<IEntityXmlSerializer>(),
+                Mock.Of<IPublishedModelFactory>());
 
             // invariant is the current default
             _variationAccesor.VariationContext = new VariationContext();

src/Umbraco.Tests/Scoping/ScopedNuCacheTests.cs

@@ -97,8 +97,9 @@ namespace Umbraco.Tests.Scoping
                 documentRepository, mediaRepository, memberRepository,
                 DefaultCultureAccessor,
                 new DatabaseDataSource(),
-                Factory.GetInstance<IGlobalSettings>(), new SiteDomainHelper(), contentTypeServiceBaseFactory,
-                Factory.GetInstance<IEntityXmlSerializer>());
+                Factory.GetInstance<IGlobalSettings>(), new SiteDomainHelper(),
+                Factory.GetInstance<IEntityXmlSerializer>(),
+                Mock.Of<IPublishedModelFactory>());
         }
 
         protected UmbracoContext GetUmbracoContextNu(string url, int templateId = 1234, RouteData routeData = null, bool setSingleton = false, IUmbracoSettingsSection umbracoSettings = null, IEnumerable<IUrlProvider> urlProviders = null)

src/Umbraco.Tests/Services/ContentTypeServiceVariantsTests.cs

@@ -70,8 +70,9 @@ namespace Umbraco.Tests.Services
                 documentRepository, mediaRepository, memberRepository,
                 DefaultCultureAccessor,
                 new DatabaseDataSource(),
-                Factory.GetInstance<IGlobalSettings>(), new SiteDomainHelper(), contentTypeServiceBaseFactory,
-                Factory.GetInstance<IEntityXmlSerializer>());
+                Factory.GetInstance<IGlobalSettings>(), new SiteDomainHelper(),
+                Factory.GetInstance<IEntityXmlSerializer>(),
+                Mock.Of<IPublishedModelFactory>());
         }
 
         public class LocalServerMessenger : ServerMessengerBase

src/Umbraco.Tests/Umbraco.Tests.csproj

@@ -80,7 +80,7 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="8.0.0" />
     <PackageReference Include="Castle.Core" Version="4.3.1" />
-    <PackageReference Include="Examine" Version="1.0.0" />
+    <PackageReference Include="Examine" Version="1.0.1" />
     <PackageReference Include="HtmlAgilityPack">
       <Version>1.8.14</Version>
     </PackageReference>

src/Umbraco.Web.UI.Client/package-lock.json

@@ -5210,12 +5210,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -5230,17 +5232,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -5357,7 +5362,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -5369,6 +5375,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -5383,6 +5390,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -5390,12 +5398,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -5414,6 +5424,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -5494,7 +5505,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -5506,6 +5518,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -5627,6 +5640,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",

src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditornavigationitem.directive.js

@@ -42,7 +42,7 @@
                 item: '=',
                 onOpen: '&',
                 onOpenAnchor: '&',
-                index: '@'
+                hotkey: '<'
             }
         });
 

src/Umbraco.Web.UI.Client/src/common/directives/components/upload/umbfileupload.directive.js

@@ -15,10 +15,12 @@ function umbFileUpload() {
             el.on('change', function (event) {
                 var files = event.target.files;
                 //emit event upward
-                scope.$emit("filesSelected", { files: files });                           
+                scope.$emit("filesSelected", { files: files });
+                //clear the element value - this allows us to pick the same file again and again
+                el.val('');
             });
         }
     };
 }
 
-angular.module('umbraco.directives').directive("umbFileUpload", umbFileUpload);
+angular.module('umbraco.directives').directive("umbFileUpload", umbFileUpload);

src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js

@@ -26,6 +26,8 @@ function navigationService($routeParams, $location, $q, $timeout, $injector, eve
         navReadyPromise.resolve(mainTreeApi);
     });
 
+    
+
     //A list of query strings defined that when changed will not cause a reload of the route
     var nonRoutingQueryStrings = ["mculture", "cculture", "lq"];
     var retainedQueryStrings = ["mculture"];

src/Umbraco.Web.UI.Client/src/common/services/tree.service.js

@@ -350,6 +350,9 @@ function treeService($q, treeResource, iconHelper, notificationsService, eventsS
             parent.children.splice(parent.children.indexOf(treeNode), 1);
 
             parent.hasChildren = parent.children.length !== 0;
+            
+            //Notify that the node has been removed
+            eventsService.emit("treeService.removeNode", { node: treeNode });
         },
 
         /**

src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js

@@ -9,7 +9,7 @@
  *
  * @param {navigationService} navigationService A reference to the navigationService
  */
-function NavigationController($scope, $rootScope, $location, $log, $q, $routeParams, $timeout, $cookies, treeService, appState, navigationService, keyboardService, historyService, eventsService, angularHelper, languageResource, contentResource) {
+function NavigationController($scope, $rootScope, $location, $log, $q, $routeParams, $timeout, $cookies, treeService, appState, navigationService, keyboardService, historyService, eventsService, angularHelper, languageResource, contentResource, editorState) {
 
     //this is used to trigger the tree to start loading once everything is ready
     var treeInitPromise = $q.defer();
@@ -249,6 +249,20 @@ function NavigationController($scope, $rootScope, $location, $log, $q, $routePar
         $scope.infiniteMode = args && args.editors.length > 0 ? true : false;
     }));
 
+    evts.push(eventsService.on("treeService.removeNode", function (e, args) {
+        //check to see if the current page has been removed
+
+        var currentEditorState = editorState.getCurrent()
+        if (currentEditorState && currentEditorState.id.toString() === args.node.id.toString()) {
+            //current page is loaded, so navigate to root
+            var section = appState.getSectionState("currentSection");
+            $location.path("/" + section);
+        }
+    }));
+
+
+    
+
     /**
      * Based on the current state of the application, this configures the scope variables that control the main tree and language drop down
      */

src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less

@@ -166,7 +166,9 @@ body.touch .umb-tree {
 }
 
 .umb-tree .umb-tree-node-checked > .umb-tree-item__inner > i[class^="icon-"],
-.umb-tree .umb-tree-node-checked > .umb-tree-item__inner > i[class*=" icon-"] {
+.umb-tree .umb-tree-node-checked > .umb-tree-item__inner > i[class*=" icon-"],
+.umb-tree .umb-tree-node-checked .umb-search-group-item-name > i[class^="icon-"],
+.umb-tree .umb-tree-node-checked .umb-search-group-item-name > i[class*=" icon-"] {
     font-family: 'icomoon' !important;
     color: @green !important;
 

src/Umbraco.Web.UI.Client/src/less/components/umb-table.less

@@ -151,14 +151,14 @@ input.umb-table__input {
 
 // Show checkmark when checked, hide file icon
 .umb-table-row--selected {
-    /*
+    
     .umb-table-body__fileicon {
         display: none;
     }
     .umb-table-body__checkicon {
         display: inline-block;
     }
-    */
+    
     &::before {
         content: "";
         position: absolute;

src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/copy/copy.controller.js

@@ -78,7 +78,7 @@
       // method to select a search result
       function selectResult(evt, result) {
           result.selected = result.selected === true ? false : true;
-          nodeSelectHandler(evt, { event: evt, node: result });
+          nodeSelectHandler({ event: evt, node: result });
       }
 
       //callback when there are search results
@@ -96,7 +96,7 @@
       // Mini list view
       $scope.selectListViewNode = function (node) {
           node.selected = node.selected === true ? false : true;
-		  nodeSelectHandler({}, { node: node });
+		  nodeSelectHandler({ node: node });
       };
 
       $scope.closeMiniListView = function () {

src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/move/move.controller.js

@@ -79,7 +79,7 @@
       // method to select a search result
       function selectResult(evt, result) {
           result.selected = result.selected === true ? false : true;
-          nodeSelectHandler(evt, { event: evt, node: result });
+          nodeSelectHandler({ event: evt, node: result });
       }
 
       //callback when there are search results
@@ -96,7 +96,7 @@
       // Mini list view
       $scope.selectListViewNode = function (node) {
 	      node.selected = node.selected === true ? false : true;
-		  nodeSelectHandler({}, { node: node });
+		  nodeSelectHandler({ node: node });
       };
 
       $scope.closeMiniListView = function () {

src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html

@@ -1,5 +1,4 @@
 <div ng-controller="Umbraco.Overlays.UserController">
-
     <div class="umb-control-group" ng-if="!showPasswordFields">
 
        <h5><localize key="user_yourProfile" /></h5>
@@ -79,7 +78,7 @@
     </div>
 
 
-    <div class="umb-control-group" ng-if="!showPasswordFields">
+    <div class="umb-control-group" ng-if="!showPasswordFields && history.length">
         <h5><localize key="user_yourHistory" /></h5>
         <ul class="umb-tree">
             <li ng-repeat="item in history | orderBy:'time':true">
@@ -127,7 +126,7 @@
 
     </div>
 
-    <div class="umb-control-group">
+    <div class="umb-control-group" ng-if="tab.length">
         <div ng-repeat="tab in dashboard">
             <div ng-repeat="property in tab.properties">
                 <div>

src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation-item.html

@@ -1,13 +1,13 @@
 <a data-element="sub-view-{{vm.item.alias}}"
-    tabindex="-1"
-    ng-href=""
-    ng-click="vm.clicked()"
-    hotkey="{{vm.index+1}}"
-    hotkey-when-hidden="true"
-    ng-class="{'is-active': vm.item.active, '-has-error': vm.item.hasError}">
+   tabindex="-1"
+   ng-href=""
+   ng-click="vm.clicked()"
+   hotkey="{{::vm.hotkey}}"
+   hotkey-when-hidden="true"
+   ng-class="{'is-active': vm.item.active, '-has-error': vm.item.hasError}">
     <i class="icon {{ vm.item.icon }}"></i>
     <span class="umb-sub-views-nav-item-text">{{ vm.item.name }}</span>
-    <div ng-show="item.badge" class="badge -type-{{vm.item.badge.type}}">{{vm.item.badge.count}}</div>
+    <div ng-show="vm.item.badge" class="badge -type-{{vm.item.badge.type}}">{{vm.item.badge.count}}</div>
 </a>
 
 <ul class="dropdown-menu umb-sub-views-nav-item__anchor_dropdown" ng-if="vm.item.anchors && vm.item.anchors.length > 1">

src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-navigation.html

@@ -7,7 +7,7 @@
                 item="navItem"
                 on-open="openNavigationItem(item)"
                 on-open-anchor="openAnchorItem(item, anchor)"
-                index="{{$index}}">
+                hotkey="$index + 1">
             </umb-editor-navigation-item>
         </div>
     </li>

src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js

@@ -93,7 +93,7 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.CopyController",
 	    // method to select a search result
 	    $scope.selectResult = function (evt, result) {
 	        result.selected = result.selected === true ? false : true;
-	        nodeSelectHandler(evt, { event: evt, node: result });
+	        nodeSelectHandler({ event: evt, node: result });
 	    };
 
 	    //callback when there are search results

src/Umbraco.Web.UI.Client/src/views/content/content.move.controller.js

@@ -66,7 +66,7 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.MoveController",
 	    // method to select a search result 
 	    $scope.selectResult = function (evt, result) {
 	        result.selected = result.selected === true ? false : true;
-	        nodeSelectHandler(evt, { event: evt, node: result });
+	        nodeSelectHandler({ event: evt, node: result });
 	    };
 
 	    //callback when there are search results 
@@ -124,7 +124,7 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.MoveController",
 		// Mini list view
 		$scope.selectListViewNode = function (node) {
 			node.selected = node.selected === true ? false : true;
-			nodeSelectHandler({}, { node: node });
+			nodeSelectHandler({ node: node });
 		};
 
 		$scope.closeMiniListView = function () {

src/Umbraco.Web.UI.Client/src/views/content/content.restore.controller.js

@@ -57,7 +57,7 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.RestoreController"
         // method to select a search result 
         $scope.selectResult = function (evt, result) {
             result.selected = result.selected === true ? false : true;
-            nodeSelectHandler(evt, { event: evt, node: result });
+            nodeSelectHandler({ event: evt, node: result });
         };
 
         //callback when there are search results 
@@ -74,7 +74,7 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.RestoreController"
         // Mini list view
         $scope.selectListViewNode = function (node) {
             node.selected = node.selected === true ? false : true;
-            nodeSelectHandler({}, { node: node });
+            nodeSelectHandler({ node: node });
         };
 
         $scope.closeMiniListView = function () {

src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html

@@ -24,21 +24,20 @@
                     <div>
                         <label for="{{variant.htmlId}}" style="margin-bottom: 2px;">
                             <span>{{ variant.language.name }}</span>
+
+                            <span class="db umb-permission__description" ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
+                                <umb-variant-state variant="variant"></umb-variant-state>
+                                <span ng-if="variant.language.isMandatory"> - <localize key="languages_mandatoryLanguage"></localize></span>
+                            </span>
+
+                            <span class="db" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
+                                <span class="db umb-permission__description" style="color: #F02E28;" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
+                            </span>
+
+                            <span class="db" ng-repeat="notification in variant.notifications">
+                                <span class="db umb-permission__description" style="color: #1FB572;">{{notification.message}}</span>
+                            </span>
                         </label>
-
-                        <div class="umb-permission__description" ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
-                            <umb-variant-state variant="variant"></umb-variant-state>
-                            <span ng-if="variant.language.isMandatory"> - <localize key="languages_mandatoryLanguage"></localize></span>
-                        </div>
-
-                        <div ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
-                            <div class="umb-permission__description" style="color: #F02E28;" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</div>
-                        </div>
-
-                        <div ng-repeat="notification in variant.notifications">
-                            <div class="umb-permission__description" style="color: #1FB572;">{{notification.message}}</div>
-                        </div>
-
                     </div>
                 </div>
 

src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html

@@ -50,21 +50,20 @@
                         <div>
                             <label for="{{variant.htmlId}}" style="margin-bottom: 0;">
                                 <span>{{ variant.language.name }}</span>
+
+                                <span class="db umb-permission__description" ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
+                                    <umb-variant-state variant="variant"></umb-variant-state>
+                                    <span ng-if="variant.language.isMandatory"> - <localize key="languages_mandatoryLanguage"></localize></span>
+                                </span>
+
+                                <span class="db" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
+                                    <span class="db umb-permission__description" style="color: #F02E28;" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
+                                </span>
+
+                                <span class="db" ng-repeat="notification in variant.notifications">
+                                    <span class="db umb-permission__description" style="color: #1FB572;">{{notification.message}}</span>
+                                </span>
                             </label>
-
-                            <div class="umb-permission__description" ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
-                                <umb-variant-state variant="variant"></umb-variant-state>
-                                <span ng-if="variant.language.isMandatory"> - <localize key="languages_mandatoryLanguage"></localize></span>
-                            </div>
-
-                            <div ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
-                                <div class="umb-permission__description" style="color: #F02E28;" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</div>
-                            </div>
-
-                            <div ng-repeat="notification in variant.notifications">
-                                <div class="umb-permission__description" style="color: #1FB572;">{{notification.message}}</div>
-                            </div>
-
                         </div>
                     </div>
 

src/Umbraco.Web.UI.Client/src/views/content/overlays/save.html

@@ -28,20 +28,19 @@
                             <label for="{{variant.htmlId}}" style="margin-bottom: 2px;">
                                 <span>{{ variant.language.name }}</span>
                                 <strong ng-if="variant.language.isMandatory" class="umb-control-required">*</strong>
+
+                                <span class="db" ng-if="!saveVariantSelectorForm.$invalid && !(variant.notifications && variant.notifications.length > 0)">
+                                    <umb-variant-state class="umb-permission__description" variant="variant"></umb-variant-state>
+                                </span>
+
+                                <span class="db" ng-messages="saveVariantSelectorForm.saveVariantSelector.$error" show-validation-on-submit>
+                                    <span class="db umb-permission__description" style="color: #F02E28;" ng-message="valServerField">{{saveVariantSelectorForm.saveVariantSelector.errorMsg}}</span>
+                                </span>
+
+                                <span class="db" ng-repeat="notification in variant.notifications">
+                                    <span class="db umb-permission__description" style="color: #1FB572;">{{notification.message}}</span>
+                                </span>
                             </label>
-
-                            <div ng-if="!saveVariantSelectorForm.$invalid && !(variant.notifications && variant.notifications.length > 0)">
-                                <umb-variant-state class="umb-permission__description" variant="variant"></umb-variant-state>
-                            </div>
-
-                            <div ng-messages="saveVariantSelectorForm.saveVariantSelector.$error" show-validation-on-submit>
-                                <div class="umb-permission__description" style="color: #F02E28;" ng-message="valServerField">{{saveVariantSelectorForm.saveVariantSelector.errorMsg}}</div>
-                            </div>
-
-                            <div ng-repeat="notification in variant.notifications">
-                                <div class="umb-permission__description" style="color: #1FB572;">{{notification.message}}</div>
-                            </div>
-
                         </div>
                     </div>
 
@@ -72,20 +71,19 @@
                             <label for="{{variant.htmlId}}" style="margin-bottom: 2px;">
                                 <span>{{ variant.language.name }}</span>
                                 <strong ng-if="variant.language.isMandatory" class="umb-control-required">*</strong>
+
+                                <span class="db" ng-if="!saveVariantSelectorForm.$invalid && !(variant.notifications && variant.notifications.length > 0)">
+                                    <umb-variant-state class="umb-permission__description" variant="variant"></umb-variant-state>
+                                </span>
+
+                                <span class="db" ng-messages="saveVariantSelectorForm.saveVariantSelector.$error" show-validation-on-submit>
+                                    <span class="db umb-permission__description" style="color: #F02E28;" ng-message="valServerField">{{saveVariantSelectorForm.saveVariantSelector.errorMsg}}</span>
+                                </span>
+
+                                <span class="db" ng-repeat="notification in variant.notifications">
+                                    <span class="db umb-permission__description" style="color: #1FB572;">{{notification.message}}</span>
+                                </span>
                             </label>
-
-                            <div ng-if="!saveVariantSelectorForm.$invalid && !(variant.notifications && variant.notifications.length > 0)">
-                                <umb-variant-state class="umb-permission__description" variant="variant"></umb-variant-state>
-                            </div>
-
-                            <div ng-messages="saveVariantSelectorForm.saveVariantSelector.$error" show-validation-on-submit>
-                                <div class="umb-permission__description" style="color: #F02E28;" ng-message="valServerField">{{saveVariantSelectorForm.saveVariantSelector.errorMsg}}</div>
-                            </div>
-
-                            <div ng-repeat="notification in variant.notifications">
-                                <div class="umb-permission__description" style="color: #1FB572;">{{notification.message}}</div>
-                            </div>
-
                         </div>
                     </div>
 

src/Umbraco.Web.UI.Client/src/views/content/overlays/schedule.html

@@ -97,13 +97,13 @@
 
                             <label for="{{'saveVariantSelector_' + variant.language.culture}}" style="margin-bottom: 2px;">
                                 <span>{{ variant.language.name }}</span>
-                            </label>
 
-                            <div class="umb-permission__description"
-                                 ng-if="!scheduleSelectorForm.$invalid && !(variant.notifications && variant.notifications.length > 0)">
-                                <umb-variant-state variant="variant"></umb-variant-state>
-                                <span ng-show="variant.language.isMandatory"> - <localize key="languages_mandatoryLanguage"></localize></span>
-                            </div>
+                                <span class="db umb-permission__description"
+                                      ng-if="!scheduleSelectorForm.$invalid && !(variant.notifications && variant.notifications.length > 0)">
+                                    <umb-variant-state variant="variant"></umb-variant-state>
+                                    <span ng-show="variant.language.isMandatory"> - <localize key="languages_mandatoryLanguage"></localize></span>
+                                </span>
+                            </label>
 
                             <div class="flex items-center" style="margin-top: 10px; margin-bottom: 10px;">
 

src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.controller.js

@@ -23,6 +23,12 @@
 
 
             if (vm.variants.length !== 0) {
+                _.each(vm.variants,
+                    function (variant) {
+                        variant.compositeId = variant.language.culture + "_" + (variant.segment ? variant.segment : "");
+                        variant.htmlId = "_content_variant_" + variant.compositeId;
+                    });
+
                 //now sort it so that the current one is at the top
                 vm.variants = _.sortBy(vm.variants, function (v) {
                     return v.active ? 0 : 1;

src/Umbraco.Web.UI.Client/src/views/content/overlays/sendtopublish.html

@@ -24,20 +24,19 @@
                         <label for="{{variant.htmlId}}" style="margin-bottom: 2px;">
                             <span>{{ variant.language.name }}</span>
                             <strong ng-if="variant.language.isMandatory" class="umb-control-required">*</strong>
+
+                            <span class="db" ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
+                                <umb-variant-state class="umb-permission__description" variant="variant"></umb-variant-state>
+                            </span>
+
+                            <span class="db" ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
+                                <span class="db umb-permission__description" style="color: #F02E28;" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</span>
+                            </span>
+
+                            <span class="db" ng-repeat="notification in variant.notifications">
+                                <span class="db umb-permission__description" style="color: #1FB572;">{{notification.message}}</span>
+                            </span>
                         </label>
-
-                        <div ng-if="!publishVariantSelectorForm.publishVariantSelector.$invalid && !(variant.notifications && variant.notifications.length > 0)">
-                            <umb-variant-state class="umb-permission__description" variant="variant"></umb-variant-state>
-                        </div>
-
-                        <div ng-messages="publishVariantSelectorForm.publishVariantSelector.$error" show-validation-on-submit>
-                            <div class="umb-permission__description" style="color: #F02E28;" ng-message="valServerField">{{publishVariantSelectorForm.publishVariantSelector.errorMsg}}</div>
-                        </div>
-
-                        <div ng-repeat="notification in variant.notifications">
-                            <div class="umb-permission__description" style="color: #1FB572;">{{notification.message}}</div>
-                        </div>
-
                     </div>
                 </div>
 

src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.controller.js

@@ -21,6 +21,12 @@
                 });
             }
 
+            _.each(vm.variants,
+                function (variant) {
+                    variant.compositeId = variant.language.culture + "_" + (variant.segment ? variant.segment : "");
+                    variant.htmlId = "_content_variant_" + variant.compositeId;
+                });
+
             // node has variants
             if (vm.variants.length !== 1) {
                 //now sort it so that the current one is at the top

src/Umbraco.Web.UI.Client/src/views/content/overlays/unpublish.html

@@ -27,13 +27,12 @@
                         <div>
                             <label for="{{variant.htmlId}}" style="margin-bottom: 2px;">
                                 <span>{{ variant.language.name }}</span>
-                            </label>
-    
-                            <div class="umb-permission__description">
-                                <umb-variant-state variant="variant"></umb-variant-state>
-                                <span ng-if="variant.language.isMandatory"> - <localize key="languages_mandatoryLanguage"></localize></span>
-                            </div>
-    
+
+                                <span class="db umb-permission__description">
+                                    <umb-variant-state variant="variant"></umb-variant-state>
+                                    <span ng-if="variant.language.isMandatory"> - <localize key="languages_mandatoryLanguage"></localize></span>
+                                </span>
+                            </label>    
                         </div>
                     </div>
     

src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js

@@ -167,7 +167,7 @@ function FormsController($scope, $cookies, packageResource, localizationService)
                     return packageResource.installData(pack);
                 }, vm.error)
             .then(function(pack) {
-                vm.state = installStateComplete;
+                vm.state = labels.installStateComplete;
                     return packageResource.cleanUp(pack);
                 }, vm.error)
             .then(vm.complete, vm.error);

src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.delete.controller.js

@@ -22,7 +22,6 @@ function DataTypeDeleteController($scope, dataTypeResource, treeService, navigat
             treeService.removeNode($scope.currentNode);
             navigationService.hideMenu();
         });
-
     };
 
     $scope.performContainerDelete = function () {

src/Umbraco.Web.UI.Client/src/views/documenttypes/delete.controller.js

@@ -20,7 +20,8 @@ function DocumentTypesDeleteController($scope, dataTypeResource, contentTypeReso
 
             // TODO: Need to sync tree, etc...
             treeService.removeNode($scope.currentNode);
-            navigationService.hideMenu();
+            navigationService.hideMenu(); 
+
         });
 
     };
@@ -38,6 +39,7 @@ function DocumentTypesDeleteController($scope, dataTypeResource, contentTypeReso
             // TODO: Need to sync tree, etc...
             treeService.removeNode($scope.currentNode);
             navigationService.hideMenu();
+
         });
 
     };

src/Umbraco.Web.UI.Client/src/views/macros/macros.delete.controller.js

@@ -6,7 +6,7 @@
  * @description
  * The controller for deleting macro items
  */
-function MacrosDeleteController($scope, $location, macroResource, navigationService, treeService) {
+function MacrosDeleteController($scope, macroResource, navigationService, treeService) {
     var vm = this;
     
     vm.name = $scope.currentNode.name;

src/Umbraco.Web.UI.Client/src/views/media/media.restore.controller.js

@@ -57,7 +57,7 @@ angular.module("umbraco").controller("Umbraco.Editors.Media.RestoreController",
         // method to select a search result 
         $scope.selectResult = function (evt, result) {
             result.selected = result.selected === true ? false : true;
-            nodeSelectHandler(evt, { event: evt, node: result });
+            nodeSelectHandler({ event: evt, node: result });
         };
 
         //callback when there are search results 
@@ -74,7 +74,7 @@ angular.module("umbraco").controller("Umbraco.Editors.Media.RestoreController",
         // Mini list view
         $scope.selectListViewNode = function (node) {
             node.selected = node.selected === true ? false : true;
-            nodeSelectHandler({}, { node: node });
+            nodeSelectHandler({ node: node });
         };
 
         $scope.closeMiniListView = function () {

src/Umbraco.Web.UI.Client/src/views/mediatypes/delete.controller.js

@@ -6,7 +6,7 @@
  * @description
  * The controller for the media type delete dialog
  */
-function MediaTypesDeleteController($scope, dataTypeResource, mediaTypeResource, treeService, navigationService) {
+function MediaTypesDeleteController($scope, mediaTypeResource, treeService, navigationService) {
 
     $scope.performDelete = function() {
 

src/Umbraco.Web.UI.Client/src/views/membertypes/delete.controller.js

@@ -21,6 +21,7 @@ function MemberTypesDeleteController($scope, memberTypeResource, treeService, na
             // TODO: Need to sync tree, etc...
             treeService.removeNode($scope.currentNode);
             navigationService.hideMenu();
+
         });
 
     };

src/Umbraco.Web.UI.Client/src/views/packages/views/installed.html

@@ -94,7 +94,7 @@
                         <div class="umb-info-local-item">
                             <strong><localize key="packager_packageReadme">Read me</localize></strong>
                             <br>
-                            <small> {{ vm.package.readme }} </small>
+                            <small ng-bind-html="vm.package.readme"></small>
                         </div>
 
                         <div class="umb-info-local-item mt4 flex items-center flex-column" ng-if="vm.installState.status == ''">

src/Umbraco.Web.UI.Client/src/views/partialviewmacros/delete.controller.js

@@ -21,6 +21,7 @@ function PartialViewMacrosDeleteController($scope, codefileResource, treeService
                 // TODO: Need to sync tree, etc...
                 treeService.removeNode($scope.currentNode);
                 navigationService.hideMenu();
+
             });
     };
 

src/Umbraco.Web.UI.Client/src/views/partialviews/delete.controller.js

@@ -24,6 +24,7 @@ function PartialViewsDeleteController($scope, codefileResource, treeService, nav
                 // TODO: Need to sync tree, etc...
                 treeService.removeNode($scope.currentNode);
                 navigationService.hideMenu();
+
             }, function (err) {
                 $scope.currentNode.loading = false;
                 $scope.error = err;

src/Umbraco.Web.UI.Client/src/views/scripts/delete.controller.js

@@ -21,6 +21,7 @@ function ScriptsDeleteController($scope, codefileResource, treeService, navigati
                 // TODO: Need to sync tree, etc...
                 treeService.removeNode($scope.currentNode);
                 navigationService.hideMenu();
+
             });
     };
 

src/Umbraco.Web.UI.Client/src/views/templates/delete.controller.js

@@ -6,7 +6,7 @@
  * @description
  * The controller for the template delete dialog
  */
-function TemplatesDeleteController($scope, templateResource , treeService, navigationService) {
+function TemplatesDeleteController($scope, templateResource, treeService, navigationService) {
 
     $scope.performDelete = function() {
 
@@ -25,6 +25,7 @@ function TemplatesDeleteController($scope, templateResource , treeService, navig
             // TODO: Need to sync tree, etc...
             treeService.removeNode($scope.currentNode);
             navigationService.hideMenu();
+
         }, function (err) {
             $scope.currentNode.loading = false;
             $scope.error = err;

src/Umbraco.Web.UI/Umbraco.Web.UI.csproj

@@ -87,7 +87,7 @@
     <PackageReference Include="CSharpTest.Net.Collections" Version="14.906.1403.1082" />
     <PackageReference Include="ClientDependency" Version="1.9.7" />
     <PackageReference Include="ClientDependency-Mvc5" Version="1.8.0.0" />
-    <PackageReference Include="Examine" Version="1.0.0" />
+    <PackageReference Include="Examine" Version="1.0.1" />
     <PackageReference Include="ImageProcessor.Web" Version="4.10.0.100" />
     <PackageReference Include="ImageProcessor.Web.Config" Version="2.5.0.100" />
     <PackageReference Include="Microsoft.AspNet.Identity.Owin" Version="2.2.2" />
@@ -340,9 +340,9 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>8000</DevelopmentServerPort>
+          <DevelopmentServerPort>8100</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8000</IISUrl>
+          <IISUrl>http://localhost:8100</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

src/Umbraco.Web.UI/Umbraco/config/lang/en.xml

@@ -1127,7 +1127,7 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="cancelAndUploadAnother">Cancel and upload another package</key>
     <key alias="accept">I accept</key>
     <key alias="termsOfUse">terms of use</key>
-    
+
     <key alias="pathToFile">Path to file</key>
     <key alias="pathToFileDescription">Absolute path to file (ie: /bin/umbraco.bin)</key>
     <key alias="installed">Installed</key>
@@ -1994,13 +1994,13 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="httpsCheckExpiringCertificate">Your website's SSL certificate is expiring in %0% days.</key>
     <key alias="healthCheckInvalidUrl">Error pinging the URL %0% - '%1%'</key>
     <key alias="httpsCheckIsCurrentSchemeHttps">You are currently %0% viewing the site using the HTTPS scheme.</key>
-    <key alias="httpsCheckConfigurationRectifyNotPossible">The appSetting 'umbracoUseSSL' is set to 'false' in your web.config file. Once you access this site using the HTTPS scheme, that should be set to 'true'.</key>
-    <key alias="httpsCheckConfigurationCheckResult">The appSetting 'umbracoUseSSL' is set to '%0%' in your web.config file, your cookies are %1% marked as secure.</key>
-    <key alias="httpsCheckEnableHttpsError">Could not update the 'umbracoUseSSL' setting in your web.config file. Error: %0%</key>
+    <key alias="httpsCheckConfigurationRectifyNotPossible">The appSetting 'Umbraco.Core.UseHttps' is set to 'false' in your web.config file. Once you access this site using the HTTPS scheme, that should be set to 'true'.</key>
+    <key alias="httpsCheckConfigurationCheckResult">The appSetting 'Umbraco.Core.UseHttps' is set to '%0%' in your web.config file, your cookies are %1% marked as secure.</key>
+    <key alias="httpsCheckEnableHttpsError">Could not update the 'Umbraco.Core.UseHttps' setting in your web.config file. Error: %0%</key>
     <!-- The following keys don't get tokens passed in -->
     <key alias="httpsCheckEnableHttpsButton">Enable HTTPS</key>
     <key alias="httpsCheckEnableHttpsDescription">Sets umbracoSSL setting to true in the appSettings of the web.config file.</key>
-    <key alias="httpsCheckEnableHttpsSuccess">The appSetting 'umbracoUseSSL' is now set to 'true' in your web.config file, your cookies will be marked as secure.</key>
+    <key alias="httpsCheckEnableHttpsSuccess">The appSetting 'Umbraco.Core.UseHttps' is now set to 'true' in your web.config file, your cookies will be marked as secure.</key>
     <key alias="rectifyButton">Fix</key>
     <key alias="cannotRectifyShouldNotEqual">Cannot fix a check with a value comparison type of 'ShouldNotEqual'.</key>
     <key alias="cannotRectifyShouldEqualWithValue">Cannot fix a check with a value comparison type of 'ShouldEqual' with a provided value.</key>

src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml

@@ -2005,13 +2005,13 @@ To manage your website, simply open the Umbraco back office and start adding con
     <key alias="httpsCheckExpiringCertificate">Your website's SSL certificate is expiring in %0% days.</key>
     <key alias="healthCheckInvalidUrl">Error pinging the URL %0% - '%1%'</key>
     <key alias="httpsCheckIsCurrentSchemeHttps">You are currently %0% viewing the site using the HTTPS scheme.</key>
-    <key alias="httpsCheckConfigurationRectifyNotPossible">The appSetting 'umbracoUseSSL' is set to 'false' in your web.config file. Once you access this site using the HTTPS scheme, that should be set to 'true'.</key>
-    <key alias="httpsCheckConfigurationCheckResult">The appSetting 'umbracoUseSSL' is set to '%0%' in your web.config file, your cookies are %1% marked as secure.</key>
-    <key alias="httpsCheckEnableHttpsError">Could not update the 'umbracoUseSSL' setting in your web.config file. Error: %0%</key>
+    <key alias="httpsCheckConfigurationRectifyNotPossible">The appSetting 'Umbraco.Core.UseHttps' is set to 'false' in your web.config file. Once you access this site using the HTTPS scheme, that should be set to 'true'.</key>
+    <key alias="httpsCheckConfigurationCheckResult">The appSetting 'Umbraco.Core.UseHttps' is set to '%0%' in your web.config file, your cookies are %1% marked as secure.</key>
+    <key alias="httpsCheckEnableHttpsError">Could not update the 'Umbraco.Core.UseHttps' setting in your web.config file. Error: %0%</key>
     <!-- The following keys don't get tokens passed in -->
     <key alias="httpsCheckEnableHttpsButton">Enable HTTPS</key>
     <key alias="httpsCheckEnableHttpsDescription">Sets umbracoSSL setting to true in the appSettings of the web.config file.</key>
-    <key alias="httpsCheckEnableHttpsSuccess">The appSetting 'umbracoUseSSL' is now set to 'true' in your web.config file, your cookies will be marked as secure.</key>
+    <key alias="httpsCheckEnableHttpsSuccess">The appSetting 'Umbraco.Core.UseHttps' is now set to 'true' in your web.config file, your cookies will be marked as secure.</key>
     <key alias="rectifyButton">Fix</key>
     <key alias="cannotRectifyShouldNotEqual">Cannot fix a check with a value comparison type of 'ShouldNotEqual'.</key>
     <key alias="cannotRectifyShouldEqualWithValue">Cannot fix a check with a value comparison type of 'ShouldEqual' with a provided value.</key>

src/Umbraco.Web.UI/Umbraco/config/lang/es.xml

@@ -1292,9 +1292,9 @@
     <key alias="mailBody"><![CDATA[
         Hola %0%.
 
-        Este mail se ha generado automáticamente para informale que %2% has solicitado que el documento '%1%' sea traducido en '%5%'. 
+        Este mail se ha generado automáticamente para informale que %2% has solicitado que el documento '%1%' sea traducido en '%5%'.
 
-        Para editarlo, vaya a la dirección http://%3%/translation/details.aspx?id=%4% o inicia sesión en umbraco y ve a http://%3% para ver las tareas pendientes de traducir. 
+        Para editarlo, vaya a la dirección http://%3%/translation/details.aspx?id=%4% o inicia sesión en umbraco y ve a http://%3% para ver las tareas pendientes de traducir.
 
         Espero que tenga un buen dia.
 
@@ -1587,13 +1587,13 @@
         <key alias="httpsCheckExpiringCertificate">El certificado SSL de tu sitio caducará en %0% días.</key>
         <key alias="healthCheckInvalidUrl">Error haciendo ping a la URL %0% - '%1%'</key>
     <key alias="httpsCheckIsCurrentSchemeHttps">Actualmente estás %0% viendo el sitio usando el esquema HTTPS.</key>
-        <key alias="httpsCheckConfigurationRectifyNotPossible">El appSetting 'umbracoUseSSL' está configurado como 'false' en tu archivo web.config. Una vez que accedes al sitio usando HTTPS, debería ser configurado como 'true'.</key>
-        <key alias="httpsCheckConfigurationCheckResult">Ele appSetting 'umbracoUseSSL' está configurado como '%0%' en tu archivo web.config, tus cookies son %1% marcadas como seguras.</key>
-    <key alias="httpsCheckEnableHttpsError">No se pudo actualizar 'umbracoUseSSL' en tu archivo web.config. Error: %0%</key>
+        <key alias="httpsCheckConfigurationRectifyNotPossible">El appSetting 'Umbraco.Core.UseHttps' está configurado como 'false' en tu archivo web.config. Una vez que accedes al sitio usando HTTPS, debería ser configurado como 'true'.</key>
+        <key alias="httpsCheckConfigurationCheckResult">Ele appSetting 'Umbraco.Core.UseHttps' está configurado como '%0%' en tu archivo web.config, tus cookies son %1% marcadas como seguras.</key>
+    <key alias="httpsCheckEnableHttpsError">No se pudo actualizar 'Umbraco.Core.UseHttps' en tu archivo web.config. Error: %0%</key>
     <!-- The following keys don't get tokens passed in -->
     <key alias="httpsCheckEnableHttpsButton">Activar HTTPS</key>
     <key alias="httpsCheckEnableHttpsDescription">Configura umbracoSSL como true en los appSettings del archivo web.config.</key>
-    <key alias="httpsCheckEnableHttpsSuccess">El appSetting 'umbracoUseSSL' está ahora configurado como 'true' en tu archivo web.config, tus cookies se marcarán como seguras.</key>
+    <key alias="httpsCheckEnableHttpsSuccess">El appSetting 'Umbraco.Core.UseHttps' está ahora configurado como 'true' en tu archivo web.config, tus cookies se marcarán como seguras.</key>
     <key alias="rectifyButton">Arreglar</key>
     <key alias="cannotRectifyShouldNotEqual">No se pudo arreglar chequeo con un valor de comparación 'ShouldNotEqual'.</key>
     <key alias="cannotRectifyShouldEqualWithValue">No se pudo arreglar chequeo con un valor de comparación 'ShouldEqual' con el valor introducido.</key>

src/Umbraco.Web.UI/Umbraco/config/lang/fr.xml

@@ -1782,13 +1782,13 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
     <key alias="httpsCheckExpiringCertificate">Le certificat SSL de votre site web va expirer dans %0% jours.</key>
     <key alias="healthCheckInvalidUrl">Erreur en essayant de contacter l'URL %0% - '%1%'</key>
     <key alias="httpsCheckIsCurrentSchemeHttps">Vous êtes actuellement %0% à voir le site via le schéma HTTPS.</key>
-    <key alias="httpsCheckConfigurationRectifyNotPossible">La valeur appSetting 'umbracoUseSSL' est fixée à 'false' dans votre fichier web.config. Une fois que vous donnerez accès à ce site en utilisant le schéma HTTPS, cette valeur devra être mise à 'true'.</key>
-    <key alias="httpsCheckConfigurationCheckResult">La valeur appSetting 'umbracoUseSSL' est fixée à '%0%' dans votre fichier web.config, vos cookies sont %1% marqués comme étant sécurisés.</key>
-    <key alias="httpsCheckEnableHttpsError">Impossible de mettre à jour la configuration 'umbracoUseSSL' dans votre fichier web.config. Erreur : %0%</key>
+    <key alias="httpsCheckConfigurationRectifyNotPossible">La valeur appSetting 'Umbraco.Core.UseHttps' est fixée à 'false' dans votre fichier web.config. Une fois que vous donnerez accès à ce site en utilisant le schéma HTTPS, cette valeur devra être mise à 'true'.</key>
+    <key alias="httpsCheckConfigurationCheckResult">La valeur appSetting 'Umbraco.Core.UseHttps' est fixée à '%0%' dans votre fichier web.config, vos cookies sont %1% marqués comme étant sécurisés.</key>
+    <key alias="httpsCheckEnableHttpsError">Impossible de mettre à jour la configuration 'Umbraco.Core.UseHttps' dans votre fichier web.config. Erreur : %0%</key>
     <!-- The following keys don't get tokens passed in -->
     <key alias="httpsCheckEnableHttpsButton">Activer HTTPS</key>
     <key alias="httpsCheckEnableHttpsDescription">Fixe la configuration 'umbracoSSL' à 'true' dans la section appSettings du fichier web.config.</key>
-    <key alias="httpsCheckEnableHttpsSuccess">La configuration appSetting 'umbracoUseSSL' est maintenant fixée à 'true' dans votre fichier web.config, vos cookies seront marqués comme étant sécurisés.</key>
+    <key alias="httpsCheckEnableHttpsSuccess">La configuration appSetting 'Umbraco.Core.UseHttps' est maintenant fixée à 'true' dans votre fichier web.config, vos cookies seront marqués comme étant sécurisés.</key>
     <key alias="rectifyButton">Corriger</key>
     <key alias="cannotRectifyShouldNotEqual">Impossible de corriger une vérification avec un type de comparaison 'ShouldNotEqual'.</key>
     <key alias="cannotRectifyShouldEqualWithValue">Impossible de corriger une vérification avec un type de comparaison 'ShouldEqual' avec une valeur spécifiée.</key>

src/Umbraco.Web.UI/Umbraco/config/lang/nl.xml

@@ -1344,13 +1344,13 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je
     <key alias="httpsCheckInvalidCertificate">Cerficaat validatie foutmelding: '%0%'</key>
     <key alias="healthCheckInvalidUrl">Fout bij pingen van URL %0% - '%1%'</key>
     <key alias="httpsCheckIsCurrentSchemeHttps">De site wordt momenteel %0% bekeken via HTTPS.</key>
-    <key alias="httpsCheckConfigurationRectifyNotPossible">De appSetting 'umbracoUseSSL' in web.config staat op 'false'. Indien HTTPS gebruikt wordt moet deze op 'true' staan.</key>
-    <key alias="httpsCheckConfigurationCheckResult">De appSetting 'umbracoUseSSL' in web.config is ingesteld op '%0%'. Cookies zijn %1% ingesteld als secure.</key>
-    <key alias="httpsCheckEnableHttpsError">De 'umbracoUseSSL' waarde in web.config kon niet aangepast worden. Foutmelding: %0%</key>
+    <key alias="httpsCheckConfigurationRectifyNotPossible">De appSetting 'Umbraco.Core.UseHttps' in web.config staat op 'false'. Indien HTTPS gebruikt wordt moet deze op 'true' staan.</key>
+    <key alias="httpsCheckConfigurationCheckResult">De appSetting 'Umbraco.Core.UseHttps' in web.config is ingesteld op '%0%'. Cookies zijn %1% ingesteld als secure.</key>
+    <key alias="httpsCheckEnableHttpsError">De 'Umbraco.Core.UseHttps' waarde in web.config kon niet aangepast worden. Foutmelding: %0%</key>
     <!-- The following keys don't get tokens passed in -->
     <key alias="httpsCheckEnableHttpsButton">HTTPS inschakelen</key>
     <key alias="httpsCheckEnableHttpsDescription">Zet in de appSettings van de web.config de umbracoSSL instelling op 'true'.</key>
-    <key alias="httpsCheckEnableHttpsSuccess">De appSetting 'umbracoUseSSL' is nu ingesteld op 'true', cookies zullen als 'secure' worden aangemerkt.</key>
+    <key alias="httpsCheckEnableHttpsSuccess">De appSetting 'Umbraco.Core.UseHttps' is nu ingesteld op 'true', cookies zullen als 'secure' worden aangemerkt.</key>
     <key alias="rectifyButton">Herstellen</key>
     <key alias="cannotRectifyShouldNotEqual">Kan een controle met vergelijkingstype 'ShouldNotEqual' niet herstellen.</key>
     <key alias="cannotRectifyShouldEqualWithValue">Kan een controle met vergelijkingstype 'ShouldNotEqual' en gedefinieerde waarde niet herstellen.</key>

src/Umbraco.Web.UI/Umbraco/config/lang/pl.xml

@@ -1423,13 +1423,13 @@ Naciśnij przycisk <strong>instaluj</strong>, aby zainstalować bazę danych Umb
     <key alias="httpsCheckExpiringCertificate">Certyfikat SSL Twojej strony wygaśnie za %0% dni.</key>
     <key alias="healthCheckInvalidUrl">Błąd pingowania adresu URL %0% - '%1%'</key>
     <key alias="httpsCheckIsCurrentSchemeHttps">Oglądasz %0% stronę używając HTTPS.</key>
-    <key alias="httpsCheckConfigurationRectifyNotPossible">appSetting 'umbracoUseSSL' został ustawiony na 'false' w Twoim pliku web.config. Po uzyskaniu dostępu do strony, używając HTTPS, powinieneś go ustawić na 'true'.</key>
-    <key alias="httpsCheckConfigurationCheckResult">appSetting 'umbracoUseSSL' został ustawiony na '%0%' w Twoim pliku web.config, Twoje ciasteczka są %1% ustawione jako bezpieczne.</key>
-    <key alias="httpsCheckEnableHttpsError">Nie można zaktualizaować ustawień 'umbracoUseSSL' w Twoim pliku web.config file. Błąd: %0%</key>
+    <key alias="httpsCheckConfigurationRectifyNotPossible">appSetting 'Umbraco.Core.UseHttps' został ustawiony na 'false' w Twoim pliku web.config. Po uzyskaniu dostępu do strony, używając HTTPS, powinieneś go ustawić na 'true'.</key>
+    <key alias="httpsCheckConfigurationCheckResult">appSetting 'Umbraco.Core.UseHttps' został ustawiony na '%0%' w Twoim pliku web.config, Twoje ciasteczka są %1% ustawione jako bezpieczne.</key>
+    <key alias="httpsCheckEnableHttpsError">Nie można zaktualizaować ustawień 'Umbraco.Core.UseHttps' w Twoim pliku web.config file. Błąd: %0%</key>
     <!-- Następujące klucze nie mają przekazanych tokenów -->
     <key alias="httpsCheckEnableHttpsButton">Włącz HTTPS</key>
     <key alias="httpsCheckEnableHttpsDescription">Ustawia umbracoSSL na 'true' w appSettings pliku web.config.</key>
-    <key alias="httpsCheckEnableHttpsSuccess">appSetting 'umbracoUseSSL' jest teraz ustawione na 'true' w Twoim pliku web.config, Twoje ciasteczka będą oznaczone jako bezpieczne.</key>
+    <key alias="httpsCheckEnableHttpsSuccess">appSetting 'Umbraco.Core.UseHttps' jest teraz ustawione na 'true' w Twoim pliku web.config, Twoje ciasteczka będą oznaczone jako bezpieczne.</key>
     <key alias="rectifyButton">Napraw</key>
     <key alias="cannotRectifyShouldNotEqual">Nie można naprawić sprawdzenia z wartością typu porównania 'ShouldNotEqual'.</key>
     <key alias="cannotRectifyShouldEqualWithValue">Nie można naprawić sprawdzenia z wartością typu porównania 'ShouldEqual' z wprowadzoną wartością.</key>

src/Umbraco.Web.UI/Umbraco/config/lang/ru.xml

@@ -712,13 +712,13 @@
     <key alias="httpsCheckValidCertificate">Сертификат Вашего веб-сайта отмечен как проверенный.</key>
     <key alias="httpsCheckInvalidCertificate">Ошибка проверки сертификата: '%0%'</key>
     <key alias="httpsCheckIsCurrentSchemeHttps">Сейчас Вы %0% просматриваете сайт, используя протокол HTTPS.</key>
-    <key alias="httpsCheckConfigurationRectifyNotPossible">Параметр 'umbracoUseSSL' в секции 'appSetting' установлен в 'false' в файле web.config. Если Вам необходим доступ к сайту по протоколу HTTPS, нужно установить данный параметр в 'true'.</key>
-    <key alias="httpsCheckConfigurationCheckResult">Параметр 'umbracoUseSSL' в секции 'appSetting' в файле установлен в '%0%', значения cookies %1% маркированы как безопасные.</key>
-    <key alias="httpsCheckEnableHttpsError">Невозможно обновить значение параметра 'umbracoUseSSL' в файле web.config. Ошибка: %0%</key>
+    <key alias="httpsCheckConfigurationRectifyNotPossible">Параметр 'Umbraco.Core.UseHttps' в секции 'appSetting' установлен в 'false' в файле web.config. Если Вам необходим доступ к сайту по протоколу HTTPS, нужно установить данный параметр в 'true'.</key>
+    <key alias="httpsCheckConfigurationCheckResult">Параметр 'Umbraco.Core.UseHttps' в секции 'appSetting' в файле установлен в '%0%', значения cookies %1% маркированы как безопасные.</key>
+    <key alias="httpsCheckEnableHttpsError">Невозможно обновить значение параметра 'Umbraco.Core.UseHttps' в файле web.config. Ошибка: %0%</key>
     <!-- The following keys don't get tokens passed in -->
     <key alias="httpsCheckEnableHttpsButton">Разрешить HTTPS</key>
     <key alias="httpsCheckEnableHttpsDescription">Устанавливает значение параметра 'umbracoSSL' в 'true' в секции 'appSettings' файла web.config.</key>
-    <key alias="httpsCheckEnableHttpsSuccess">Параметр 'umbracoUseSSL' в секции 'appSetting' файла web.config теперь установлен в 'true', значения cookies будут промаркированы как безопасные.</key>
+    <key alias="httpsCheckEnableHttpsSuccess">Параметр 'Umbraco.Core.UseHttps' в секции 'appSetting' файла web.config теперь установлен в 'true', значения cookies будут промаркированы как безопасные.</key>
     <key alias="rectifyButton">Исправить</key>
     <key alias="cannotRectifyShouldNotEqual">Невозможно исправление по результату проверки значения на 'ShouldNotEqual'.</key>
     <key alias="cannotRectifyShouldEqualWithValue">Невозможно исправление по результату проверки значения на 'ShouldEqual' с предоставленным значением.</key>

src/Umbraco.Web.UI/Umbraco/config/lang/zh.xml

@@ -1208,13 +1208,13 @@
     <key alias="httpsCheckInvalidCertificate">Certificate validation error: '%0%'</key>
     <key alias="httpsCheckInvalidUrl">Error pinging the URL %0% - '%1%'</key>
     <key alias="httpsCheckIsCurrentSchemeHttps">You are currently %0% viewing the site using the HTTPS scheme.</key>
-    <key alias="httpsCheckConfigurationRectifyNotPossible">The appSetting 'umbracoUseSSL' is set to 'false' in your web.config file. Once you access this site using the HTTPS scheme, that should be set to 'true'.</key>
-    <key alias="httpsCheckConfigurationCheckResult">The appSetting 'umbracoUseSSL' is set to '%0%' in your web.config file, your cookies are %1% marked as secure.</key>
-    <key alias="httpsCheckEnableHttpsError">Could not update the 'umbracoUseSSL' setting in your web.config file. Error: %0%</key>
+    <key alias="httpsCheckConfigurationRectifyNotPossible">The appSetting 'Umbraco.Core.UseHttps' is set to 'false' in your web.config file. Once you access this site using the HTTPS scheme, that should be set to 'true'.</key>
+    <key alias="httpsCheckConfigurationCheckResult">The appSetting 'Umbraco.Core.UseHttps' is set to '%0%' in your web.config file, your cookies are %1% marked as secure.</key>
+    <key alias="httpsCheckEnableHttpsError">Could not update the 'Umbraco.Core.UseHttps' setting in your web.config file. Error: %0%</key>
     <!-- The following keys don't get tokens passed in -->
     <key alias="httpsCheckEnableHttpsButton">Enable HTTPS</key>
     <key alias="httpsCheckEnableHttpsDescription">Sets umbracoSSL setting to true in the appSettings of the web.config file.</key>
-    <key alias="httpsCheckEnableHttpsSuccess">The appSetting 'umbracoUseSSL' is now set to 'true' in your web.config file, your cookies will be marked as secure.</key>
+    <key alias="httpsCheckEnableHttpsSuccess">The appSetting 'Umbraco.Core.UseHttps' is now set to 'true' in your web.config file, your cookies will be marked as secure.</key>
     <key alias="rectifyButton">Fix</key>
     <key alias="cannotRectifyShouldNotEqual">Cannot fix a check with a value comparison type of 'ShouldNotEqual'.</key>
     <key alias="cannotRectifyShouldEqualWithValue">Cannot fix a check with a value comparison type of 'ShouldEqual' with a provided value.</key>

src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml

@@ -1187,13 +1187,13 @@
     <key alias="httpsCheckInvalidCertificate">憑證驗證錯誤：%0%</key>
     <key alias="healthCheckInvalidUrl">網址探查錯誤：%0% - '%1%'</key>
     <key alias="httpsCheckIsCurrentSchemeHttps">您目前使用HTTPS瀏覽本站：%0%</key>
-    <key alias="httpsCheckConfigurationRectifyNotPossible">在您的web.config檔案中，appSetting的umbracoUseSSL是設為false。當您開始使用HTTPS時，應將其改為 true。</key>
-    <key alias="httpsCheckConfigurationCheckResult">在您的web.config檔案中，appSetting的umbracoUseSSL是設為 %0%，您的cookies %0% 標成安全。</key>
-    <key alias="httpsCheckEnableHttpsError">無法在您的web.config檔案中，更新appSetting的umbracoUseSSL設定，錯誤訊息：%0%</key>
+    <key alias="httpsCheckConfigurationRectifyNotPossible">在您的web.config檔案中，appSetting的Umbraco.Core.UseHttps是設為false。當您開始使用HTTPS時，應將其改為 true。</key>
+    <key alias="httpsCheckConfigurationCheckResult">在您的web.config檔案中，appSetting的Umbraco.Core.UseHttps是設為 %0%，您的cookies %0% 標成安全。</key>
+    <key alias="httpsCheckEnableHttpsError">無法在您的web.config檔案中，更新appSetting的Umbraco.Core.UseHttps設定，錯誤訊息：%0%</key>
     <!-- The following keys don't get tokens passed in -->
     <key alias="httpsCheckEnableHttpsButton">開啟HTTPS</key>
-    <key alias="httpsCheckEnableHttpsDescription">在web.config檔案中，將appSetting的umbracoUseSSL設true。</key>
-    <key alias="httpsCheckEnableHttpsSuccess">在您的web.config檔案中，appSetting的umbracoUseSSL已設為 true，您的cookies 將被標成安全。</key>
+    <key alias="httpsCheckEnableHttpsDescription">在web.config檔案中，將appSetting的Umbraco.Core.UseHttps設true。</key>
+    <key alias="httpsCheckEnableHttpsSuccess">在您的web.config檔案中，appSetting的Umbraco.Core.UseHttps已設為 true，您的cookies 將被標成安全。</key>
     <key alias="rectifyButton">修正</key>
     <key alias="cannotRectifyShouldNotEqual">無法修正比較種類檢查為'ShouldNotEqual'。</key>
     <key alias="cannotRectifyShouldEqualWithValue">用提供的數值無法修正比較種類檢查為'ShouldEqual'。</key>

src/Umbraco.Web.UI/config/splashes/NoNodes.aspx.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Web;
-using System.Web.WebPages;
 using Umbraco.Web.Composing;
 
 namespace Umbraco.Web.UI.Config.Splashes

src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
@@ -82,20 +83,8 @@ namespace Umbraco.Web.Cache
             // service of changes, else factories may try to rebuild models while
             // we are using the database to load content into caches
 
-            // ReSharper disable once SuspiciousTypeConversion.Global
-            if (_publishedModelFactory is ILivePublishedModelFactory live)
-            {
-                lock (live.SyncRoot)
-                {
-                    live.Refresh();
-                    _publishedSnapshotService.Notify(payloads);
-                }
-            }
-            else
-            {
-                // ReSharper disable once InconsistentlySynchronizedField
-                _publishedSnapshotService.Notify(payloads);
-            }
+            _publishedModelFactory.WithSafeLiveFactory(() =>
+                _publishedSnapshotService.Notify(payloads));
 
             // now we can trigger the event
             base.Refresh(payloads);

src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs

@@ -1,4 +1,5 @@
 using System;
+using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
@@ -65,20 +66,8 @@ namespace Umbraco.Web.Cache
             // service of changes, else factories may try to rebuild models while
             // we are using the database to load content into caches
 
-            // ReSharper disable once SuspiciousTypeConversion.Global
-            if (_publishedModelFactory is ILivePublishedModelFactory live)
-            {
-                lock (live.SyncRoot)
-                {
-                    live.Refresh();
-                    _publishedSnapshotService.Notify(payloads);
-                }
-            }
-            else
-            {
-                // ReSharper disable once InconsistentlySynchronizedField
-                _publishedSnapshotService.Notify(payloads);
-            }
+            _publishedModelFactory.WithSafeLiveFactory(() =>
+                _publishedSnapshotService.Notify(payloads));
 
             base.Refresh(payloads);
         }

src/Umbraco.Web/Cache/DistributedCacheBinder_Handlers.cs

@@ -119,8 +119,8 @@ namespace Umbraco.Web.Cache
                 () => MemberGroupService.Deleted -= MemberGroupService_Deleted);
 
             // bind to media events - handles all media changes
-            Bind(() => MediaService.TreeChanged += MediaService_Changed,
-                () => MediaService.TreeChanged -= MediaService_Changed);
+            Bind(() => MediaService.TreeChanged += MediaService_TreeChanged,
+                () => MediaService.TreeChanged -= MediaService_TreeChanged);
 
             // bind to content events
             Bind(() => ContentService.Saved += ContentService_Saved, // needed for permissions
@@ -403,7 +403,7 @@ namespace Umbraco.Web.Cache
 
         #region MediaService
 
-        private void MediaService_Changed(IMediaService sender, TreeChange<IMedia>.EventArgs args)
+        private void MediaService_TreeChanged(IMediaService sender, TreeChange<IMedia>.EventArgs args)
         {
             _distributedCache.RefreshMediaCache(args.Changes.ToArray());
         }

src/Umbraco.Web/HealthCheck/Checks/Security/HttpsCheck.cs

@@ -183,7 +183,7 @@ namespace Umbraco.Web.HealthCheck.Checks.Security
         private HealthCheckStatus FixHttpsSetting()
         {
             var configFile = IOHelper.MapPath("~/Web.config");
-            const string xPath = "/configuration/appSettings/add[@key='umbracoUseSSL']/@value";
+            const string xPath = "/configuration/appSettings/add[@key='Umbraco.Core.UseHttps']/@value";
             var configurationService = new ConfigurationService(configFile, xPath, _textService);
             var updateConfigFile = configurationService.UpdateConfigFile("true");
 

src/Umbraco.Web/Mvc/UmbracoRequireHttpsAttribute.cs

@@ -7,17 +7,17 @@ using GlobalSettings = Umbraco.Core.Configuration.GlobalSettings;
 namespace Umbraco.Web.Mvc
 {
     /// <summary>
-    /// If umbracoUseSSL property in web.config is set to true, this filter will redirect any http access to https.
+    /// If Umbraco.Core.UseHttps property in web.config is set to true, this filter will redirect any http access to https.
     /// </summary>
     public class UmbracoRequireHttpsAttribute : RequireHttpsAttribute
     {
         /// <summary>
-        /// If umbracoUseSSL is true and we have a non-HTTPS request, handle redirect.
+        /// If Umbraco.Core.UseHttps is true and we have a non-HTTPS request, handle redirect.
         /// </summary>
         /// <param name="filterContext">Filter context</param>
         protected override void HandleNonHttpsRequest(AuthorizationContext filterContext)
         {
-            // If umbracoUseSSL is set, let base method handle redirect.  Otherwise, we don't care.
+            // If Umbraco.Core.UseHttps is set, let base method handle redirect.  Otherwise, we don't care.
             if (Current.Configs.Global().UseHttps)
             {
                 base.HandleNonHttpsRequest(filterContext);
@@ -25,7 +25,7 @@ namespace Umbraco.Web.Mvc
         }
 
         /// <summary>
-        /// Check to see if HTTPS is currently being used if umbracoUseSSL is true.
+        /// Check to see if HTTPS is currently being used if Umbraco.Core.UseHttps is true.
         /// </summary>
         /// <param name="filterContext">Filter context</param>
         public override void OnAuthorization(AuthorizationContext filterContext)

src/Umbraco.Web/PropertyEditors/ValueConverters/RteMacroRenderingValueConverter.cs

@@ -57,7 +57,7 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
                         macroAlias,
                         umbracoContext.PublishedRequest?.PublishedContent,
                         //needs to be explicitly casted to Dictionary<string, object>
-                        macroAttributes.ConvertTo(x => (string)x, x => x)).ToString()));
+                        macroAttributes.ConvertTo(x => (string)x, x => x)).GetAsText()));
 
                 return sb.ToString();
             }

src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs

@@ -44,9 +44,9 @@ namespace Umbraco.Web.PublishedCache.NuCache
         private readonly IMemberRepository _memberRepository;
         private readonly IGlobalSettings _globalSettings;
         private readonly ISiteDomainHelper _siteDomainHelper;
-        private readonly IContentTypeBaseServiceProvider _contentTypeBaseServiceProvider;
         private readonly IEntityXmlSerializer _entitySerializer;
         private readonly IDefaultCultureAccessor _defaultCultureAccessor;
+        private readonly IPublishedModelFactory _publishedModelFactory;
 
         // volatile because we read it with no lock
         private volatile bool _isReady;
@@ -88,8 +88,8 @@ namespace Umbraco.Web.PublishedCache.NuCache
             IUmbracoContextAccessor umbracoContextAccessor, ILogger logger, IScopeProvider scopeProvider,
             IDocumentRepository documentRepository, IMediaRepository mediaRepository, IMemberRepository memberRepository,
             IDefaultCultureAccessor defaultCultureAccessor,
-            IDataSource dataSource, IGlobalSettings globalSettings, ISiteDomainHelper siteDomainHelper, IContentTypeBaseServiceProvider contentTypeBaseServiceProvider,
-            IEntityXmlSerializer entitySerializer)
+            IDataSource dataSource, IGlobalSettings globalSettings, ISiteDomainHelper siteDomainHelper,
+            IEntityXmlSerializer entitySerializer, IPublishedModelFactory publishedModelFactory)
             : base(publishedSnapshotAccessor, variationContextAccessor)
         {
             //if (Interlocked.Increment(ref _singletonCheck) > 1)
@@ -107,7 +107,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
             _defaultCultureAccessor = defaultCultureAccessor;
             _globalSettings = globalSettings;
             _siteDomainHelper = siteDomainHelper;
-            _contentTypeBaseServiceProvider = contentTypeBaseServiceProvider;
+            _publishedModelFactory = publishedModelFactory;
 
             // we need an Xml serializer here so that the member cache can support XPath,
             // for members this is done by navigating the serialized-to-xml member
@@ -167,7 +167,7 @@ namespace Umbraco.Web.PublishedCache.NuCache
 
             _domainStore = new SnapDictionary<int, Domain>();
 
-            LoadCaches();
+            _publishedModelFactory.WithSafeLiveFactory(LoadCaches);
 
             Guid GetUid(ContentStore store, int id) => store.LiveSnapshot.Get(id)?.Uid ?? default;
             int GetId(ContentStore store, Guid uid) => store.LiveSnapshot.Get(uid)?.Id ?? default;
@@ -571,6 +571,10 @@ namespace Umbraco.Web.PublishedCache.NuCache
         // because now we should ALWAYS run with the database server messenger, and then the RefreshAll will
         // be processed as soon as we are configured and the messenger processes instructions.
 
+        // note: notifications for content type and data type changes should be invoked with the
+        // pure live model factory, if any, locked and refreshed - see ContentTypeCacheRefresher and
+        // DataTypeCacheRefresher
+
         public override void Notify(ContentCacheRefresher.JsonPayload[] payloads, out bool draftChanged, out bool publishedChanged)
         {
             // no cache, trash everything

src/Umbraco.Web/Routing/PublishedRouter.cs

@@ -594,29 +594,38 @@ namespace Umbraco.Web.Routing
                 }
                 else
                 {
-                    // grab the current member
-                    var member = membershipHelper.GetCurrentMember();
-                    // if the member has the "approved" and/or "locked out" properties, make sure they're correctly set before allowing access
-                    var memberIsActive = true;
-                    if (member != null)
+                    if (membershipHelper.IsUmbracoMembershipProviderActive())
                     {
-                        if (member.HasProperty(Constants.Conventions.Member.IsApproved) == false)
-                            memberIsActive = member.Value<bool>(Constants.Conventions.Member.IsApproved);
+                        // grab the current member
+                        var member = membershipHelper.GetCurrentMember();
+                        // if the member has the "approved" and/or "locked out" properties, make sure they're correctly set before allowing access
+                        var memberIsActive = true;
+                        if (member != null)
+                        {
+                            if (member.HasProperty(Constants.Conventions.Member.IsApproved) == false)
+                                memberIsActive = member.Value<bool>(Constants.Conventions.Member.IsApproved);
 
-                        if (member.HasProperty(Constants.Conventions.Member.IsLockedOut) == false)
-                            memberIsActive = member.Value<bool>(Constants.Conventions.Member.IsLockedOut) == false;
-                    }
+                            if (member.HasProperty(Constants.Conventions.Member.IsLockedOut) == false)
+                                memberIsActive = member.Value<bool>(Constants.Conventions.Member.IsLockedOut) == false;
+                        }
 
-                    if (memberIsActive == false)
-                    {
-                        _logger.Debug<PublishedRouter>("Current member is either unapproved or locked out, redirect to error page");
-                        var errorPageId = publicAccessAttempt.Result.NoAccessNodeId;
-                        if (errorPageId != request.PublishedContent.Id)
-                            request.PublishedContent = request.UmbracoContext.PublishedSnapshot.Content.GetById(errorPageId);
+                        if (memberIsActive == false)
+                        {
+                            _logger.Debug<PublishedRouter>(
+                                "Current member is either unapproved or locked out, redirect to error page");
+                            var errorPageId = publicAccessAttempt.Result.NoAccessNodeId;
+                            if (errorPageId != request.PublishedContent.Id)
+                                request.PublishedContent =
+                                    request.UmbracoContext.PublishedSnapshot.Content.GetById(errorPageId);
+                        }
+                        else
+                        {
+                            _logger.Debug<PublishedRouter>("Current member has access");
+                        }
                     }
                     else
                     {
-                        _logger.Debug<PublishedRouter>("Current member has access");
+                        _logger.Debug<PublishedRouter>("Current custom MembershipProvider member has access");
                     }
                 }
             }
@@ -666,6 +675,9 @@ namespace Umbraco.Web.Routing
                 // TODO: When we remove the need for a database for templates, then this id should be irrelevant,
                 // not sure how were going to do this nicely.
 
+                // TODO: We need to limit altTemplate to only allow templates that are assigned to the current document type!
+                // if the template isn't assigned to the document type we should log a warning and return 404
+
                 var templateId = request.PublishedContent.TemplateId;
                 request.TemplateModel = GetTemplateModel(templateId);
             }

src/Umbraco.Web/Umbraco.Web.csproj

@@ -63,7 +63,7 @@
     <PackageReference Include="AutoMapper" Version="8.0.0" />
     <PackageReference Include="ClientDependency" Version="1.9.7" />
     <PackageReference Include="CSharpTest.Net.Collections" Version="14.906.1403.1082" />
-    <PackageReference Include="Examine" Version="1.0.0" />
+    <PackageReference Include="Examine" Version="1.0.1" />
     <PackageReference Include="HtmlAgilityPack" Version="1.8.14" />
     <PackageReference Include="ImageProcessor">
       <Version>2.7.0.100</Version>

src/Umbraco.Web/UmbracoHelper.cs

@@ -5,11 +5,9 @@ using System.Web;
 using System.Xml.XPath;
 using Umbraco.Core;
 using Umbraco.Core.Dictionary;
-using Umbraco.Core.Exceptions;
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
 using Umbraco.Core.Xml;
-using Umbraco.Web.Routing;
 using Umbraco.Web.Security;
 
 namespace Umbraco.Web
@@ -367,6 +365,28 @@ namespace Umbraco.Web
             return ContentForObjects(ids);
         }
 
+        /// <summary>
+        /// Gets the contents corresponding to the identifiers.
+        /// </summary>
+        /// <param name="ids">The content identifiers.</param>
+        /// <returns>The existing contents corresponding to the identifiers.</returns>
+        /// <remarks>If an identifier does not match an existing content, it will be missing in the returned value.</remarks>
+        public IEnumerable<IPublishedContent> Content(params Udi[] ids)
+        {
+            return ids.Select(id => ContentQuery.Content(id)).WhereNotNull();
+        }
+
+        /// <summary>
+        /// Gets the contents corresponding to the identifiers.
+        /// </summary>
+        /// <param name="ids">The content identifiers.</param>
+        /// <returns>The existing contents corresponding to the identifiers.</returns>
+        /// <remarks>If an identifier does not match an existing content, it will be missing in the returned value.</remarks>
+        public IEnumerable<IPublishedContent> Content(params GuidUdi[] ids)
+        {
+            return ids.Select(id => ContentQuery.Content(id));
+        }
+
         private IEnumerable<IPublishedContent> ContentForObjects(IEnumerable<object> ids)
         {
             var idsA = ids.ToArray();
@@ -418,6 +438,27 @@ namespace Umbraco.Web
         {
             return ContentForObjects(ids);
         }
+        /// <summary>
+        /// Gets the contents corresponding to the identifiers.
+        /// </summary>
+        /// <param name="ids">The content identifiers.</param>
+        /// <returns>The existing contents corresponding to the identifiers.</returns>
+        /// <remarks>If an identifier does not match an existing content, it will be missing in the returned value.</remarks>
+        public IEnumerable<IPublishedContent> Content(IEnumerable<Udi> ids)
+        {          
+            return ids.Select(id => ContentQuery.Content(id)).WhereNotNull();
+        }
+
+        /// <summary>
+        /// Gets the contents corresponding to the identifiers.
+        /// </summary>
+        /// <param name="ids">The content identifiers.</param>
+        /// <returns>The existing contents corresponding to the identifiers.</returns>
+        /// <remarks>If an identifier does not match an existing content, it will be missing in the returned value.</remarks>
+        public IEnumerable<IPublishedContent> Content(IEnumerable<GuidUdi> ids)
+        {
+            return ids.Select(id => ContentQuery.Content(id));
+        }
 
         /// <summary>
         /// Gets the contents corresponding to the identifiers.
@@ -634,6 +675,29 @@ namespace Umbraco.Web
             return MediaForObjects(ids);
         }
 
+
+        /// <summary>
+        /// Gets the medias corresponding to the identifiers.
+        /// </summary>
+        /// <param name="ids">The media identifiers.</param>
+        /// <returns>The existing medias corresponding to the identifiers.</returns>
+        /// <remarks>If an identifier does not match an existing media, it will be missing in the returned value.</remarks>
+        public IEnumerable<IPublishedContent> Media(params Udi[] ids)
+        {
+            return ids.Select(id => ContentQuery.Media(id)).WhereNotNull();
+        }
+
+        /// <summary>
+        /// Gets the medias corresponding to the identifiers.
+        /// </summary>
+        /// <param name="ids">The media identifiers.</param>
+        /// <returns>The existing medias corresponding to the identifiers.</returns>
+        /// <remarks>If an identifier does not match an existing media, it will be missing in the returned value.</remarks>
+        public IEnumerable<IPublishedContent> Media(params GuidUdi[] ids)
+        {
+            return ids.Select(id => ContentQuery.Media(id));
+        }
+
         /// <summary>
         /// Gets the medias corresponding to the identifiers.
         /// </summary>
@@ -656,6 +720,28 @@ namespace Umbraco.Web
             return ContentQuery.Media(ids);
         }
 
+        /// <summary>
+        /// Gets the medias corresponding to the identifiers.
+        /// </summary>
+        /// <param name="ids">The media identifiers.</param>
+        /// <returns>The existing medias corresponding to the identifiers.</returns>
+        /// <remarks>If an identifier does not match an existing media, it will be missing in the returned value.</remarks>
+        public IEnumerable<IPublishedContent> Media(IEnumerable<Udi> ids)
+        {
+            return ids.Select(id => ContentQuery.Media(id)).WhereNotNull();
+        }
+
+        /// <summary>
+        /// Gets the medias corresponding to the identifiers.
+        /// </summary>
+        /// <param name="ids">The media identifiers.</param>
+        /// <returns>The existing medias corresponding to the identifiers.</returns>
+        /// <remarks>If an identifier does not match an existing media, it will be missing in the returned value.</remarks>
+        public IEnumerable<IPublishedContent> Media(IEnumerable<GuidUdi> ids)
+        {
+            return ids.Select(id => ContentQuery.Media(id));
+        }
+
         /// <summary>
         /// Gets the medias corresponding to the identifiers.
         /// </summary>

src/Umbraco.Web/WebApi/Filters/UmbracoWebApiRequireHttpsAttribute.cs

@@ -11,7 +11,7 @@ using Umbraco.Core.Configuration;
 namespace Umbraco.Web.WebApi.Filters
 {
     /// <summary>
-    /// If umbracoUseSSL property in web.config is set to true, this filter will redirect any http access to https.
+    /// If Umbraco.Core.UseHttps property in web.config is set to true, this filter will redirect any http access to https.
     /// </summary>
     /// <remarks>
     /// This will only redirect Head/Get requests, otherwise will respond with text