diff --git a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs index 848d7099ab..a3ad8f47eb 100644 --- a/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs +++ b/src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs @@ -6,6 +6,7 @@ using System.Text; using System.Threading.Tasks; using System.Web.Script.Serialization; using System.Xml; +using Newtonsoft.Json; using Umbraco.Core.Configuration; using Umbraco.Core.Logging; using Umbraco.Core.Models.Rdbms; @@ -33,6 +34,8 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven { if (!string.IsNullOrEmpty(data.Text)) { + //var cs = ApplicationContext.Current.Services.ContentService; + //fetch the current data (that's in xml format) var xml = new XmlDocument(); xml.LoadXml(data.Text); @@ -58,11 +61,27 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSeven link.Add("edit", false); link.Add("isInternal", type.Equals("internal")); + //try + //{ + // if (type.Equals("internal")) + // { + // int nodeId; + // if (int.TryParse(lnk, out nodeId)) + // link.Add("internalName", cs.GetById(nodeId).Name); + // } + //} + //catch (Exception ex) + //{ + // LogHelper.Error("Exception was thrown when trying to update related links property data, fetching internal node id", ex); + //} + links.Add((ExpandoObject) link); } //store the serialized data - data.Text = new JavaScriptSerializer().Serialize(links); + data.Text = JsonConvert.SerializeObject(links); + + database.Update(data); } } } diff --git a/src/Umbraco.Web.UI/install/steps/StarterKits.ascx b/src/Umbraco.Web.UI/install/steps/StarterKits.ascx index 5525ecddc2..a71ff25d9b 100644 --- a/src/Umbraco.Web.UI/install/steps/StarterKits.ascx +++ b/src/Umbraco.Web.UI/install/steps/StarterKits.ascx @@ -78,8 +78,7 @@

Starter kits

-

To help you get started here are some basic starter kits. They have been tailored to suit common site configurations and install useful functionality.
- Mouse over the icons to learn more about what the starter kits will install.

+

To help you get started here are some basic starter kits. They have been tailored to suit common site configurations and install useful functionality.

diff --git a/src/Umbraco.Web.UI/install/steps/theend.ascx b/src/Umbraco.Web.UI/install/steps/theend.ascx index 11404d8608..2f123741c6 100644 --- a/src/Umbraco.Web.UI/install/steps/theend.ascx +++ b/src/Umbraco.Web.UI/install/steps/theend.ascx @@ -24,13 +24,8 @@ jQuery(document).ready(function () {
-

- You’re done...now what?

-

- Excellent, you are now ready to start using Umbraco, one of the worlds most popular open - source .NET CMS. -
- If you installed a starter kit you can start by configuring your new site, just click "Preview your new website" and follow the instructions. Or to start adding content right away click "Set up your new website"

+

You’re done...now what?

+

Excellent, you are now ready to start using Umbraco, one of the worlds most popular open source .NET CMS.