Merge branch 'leekelleher-U4-337' into 7.3.0

Conflicts: src/Umbraco.Core/Umbraco.Core.csproj
2015-01-06 12:24:29 +11:00
parent 46e939715a 8509aef99a
commit fa48af02a1
18 changed files with 427 additions and 3 deletions
--- a/src/Umbraco.Web/Trees/ContentTreeController.cs
+++ b/src/Umbraco.Web/Trees/ContentTreeController.cs
@@ -177,6 +177,7 @@ namespace Umbraco.Web.Trees
            if (item.Path.Split(new[] {','}, StringSplitOptions.RemoveEmptyEntries).Contains(RecycleBinId.ToInvariantString()))
            {
                nodeMenu.DefaultMenuAlias = null;
+                nodeMenu.Items.Insert(2, new MenuItem(ActionRestore.Instance, ui.Text("actions", ActionRestore.Instance.Alias)));
            }
            else
            {