From ae18fcda1aff4dcd9b2dcfc8644c5faa630a939e Mon Sep 17 00:00:00 2001
From: hartvig <unknown@kiln.example.com>
Date: Mon, 18 Apr 2011 17:43:23 -0200
Subject: [PATCH] Work items 30127

---
 umbraco/businesslogic/BasePages/BasePage.cs       |  2 ++
 umbraco/presentation/umbraco/Trees/loadContent.cs | 15 +++++++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/umbraco/businesslogic/BasePages/BasePage.cs b/umbraco/businesslogic/BasePages/BasePage.cs
index eed3dab726..1de62ae816 100644
--- a/umbraco/businesslogic/BasePages/BasePage.cs
+++ b/umbraco/businesslogic/BasePages/BasePage.cs
@@ -151,6 +151,8 @@ namespace umbraco.BasePages {
                 if (timeout > DateTime.Now.Ticks) {
                     return true;
                 } else {
+                    // clear the usercontext id to prevent continuous logout entries
+                    BasePage.umbracoUserContextID = String.Empty;
                     BusinessLogic.Log.Add(BusinessLogic.LogTypes.Logout, BusinessLogic.User.GetUser(uid), -1, "");
 
                     return false;
diff --git a/umbraco/presentation/umbraco/Trees/loadContent.cs b/umbraco/presentation/umbraco/Trees/loadContent.cs
index 67d3c9f26c..5c02bf4cd0 100644
--- a/umbraco/presentation/umbraco/Trees/loadContent.cs
+++ b/umbraco/presentation/umbraco/Trees/loadContent.cs
@@ -78,10 +78,17 @@ namespace umbraco
             }
             else
             {
-                ///add the default actions to the content tree
-                actions.Add(ActionNew.Instance);
-                actions.Add(ActionSort.Instance);
-                actions.Add(ContextMenuSeperator.Instance);
+                // we need to get the default permissions as you can't set permissions on the very root node
+                List<IAction> nodeActions = Action.FromString(CurrentUser.GetPermissions("-1"));
+                List<IAction> allowedRootActions = new List<IAction>();
+                allowedRootActions.Add(ActionNew.Instance);
+                allowedRootActions.Add(ActionSort.Instance);
+                List<IAction> allowedMenu = GetUserAllowedActions(allowedRootActions, nodeActions);
+                actions.AddRange(allowedMenu);
+                if (allowedMenu.Count > 0 )
+                    actions.Add(ContextMenuSeperator.Instance);
+
+                // default actions for all users
                 actions.Add(ActionRePublish.Instance);
                 actions.Add(ContextMenuSeperator.Instance);
                 actions.Add(ActionRefresh.Instance);