Merge

src/Umbraco.Core/Services/ContentService.cs

@@ -1189,7 +1189,7 @@ namespace Umbraco.Core.Services
                 if (checkCurrent == false && id == content.Id) continue;
 
                 //Check if the content for the current id is published - escape the loop if we encounter content that isn't published
-                var hasPublishedVersion = ApplicationContext.Current.Services.ContentService.GetById(id).Published;
+                var hasPublishedVersion = HasPublishedVersion(id);
                 if (hasPublishedVersion == false)
                     return false;
             }

src/Umbraco.Web.UI/web.Template.Release.config

@@ -10,7 +10,7 @@
   -->
 
   <appSettings>
-    <add xdt:Transform="Remove" xdt:Locator="Match(key)" key="umbracoDbDSN"
+    <add xdt:Transform="Replace" xdt:Locator="Match(key)" key="umbracoDbDSN"
          value=""/>
     <add xdt:Transform="Replace" xdt:Locator="Match(key)" key="umbracoConfigurationStatus"
          value=""/>

src/Umbraco.Web.UI/web.Template.config

@@ -32,6 +32,7 @@
   <BaseRestExtensions configSource="config\BaseRestExtensions.config" />
 
   <appSettings>
+    <add key="umbracoDbDSN" value="" />
     <add key="umbracoConfigurationStatus" value="" />
     <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
     <add key="umbracoReservedPaths" value="~/umbraco,~/install/" />

src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseContentTree.cs

@@ -113,7 +113,7 @@ function openContent(id) {
                 node.OpenIcon = dd.ContentTypeIcon;
             }
 
-            if (dd.Published == false)
+            if (dd.HasPublishedVersion() == false)
                 node.Style.DimNode();
 
             if (dd.HasPendingChanges())

src/Umbraco.Web/umbraco.presentation/umbraco/editContent.aspx.cs

@@ -382,7 +382,7 @@ namespace umbraco.cms.presentation
 
         void UpdateNiceUrls()
         {
-            if (!_documentHasPublishedVersion || _document.Published == false)
+            if (_documentHasPublishedVersion == false)
             {
                 UpdateNiceUrlProperties("<i>" + ui.Text("content", "itemNotPublished", base.getUser()) + "</i>", null);
                 return;