From 152cbabfa64f3f074a9cdcff8e2a6045c0cf35de Mon Sep 17 00:00:00 2001
From: Shandem <unknown@kiln.example.com>
Date: Thu, 17 Dec 2009 07:12:54 +0000
Subject: [PATCH] DO NOT DOWNLOAD, STABLE RELEASE AVAILABLE ON THE DOWNLOADS
 TAB Fixes many path issues relating to GlobalSettings.Path

[TFS Changeset #62345]
---
 UpgradeReadme.txt                                          | 2 +-
 components/editorControls/umbraco.editorControls.csproj    | 2 +-
 umbraco/presentation/install/default.aspx                  | 2 +-
 umbraco/presentation/install/default.aspx.designer.cs      | 2 +-
 umbraco/presentation/umbraco/create/xslt.ascx.cs           | 2 +-
 .../umbraco/developer/Macros/assemblyBrowser.aspx          | 7 ++++---
 .../developer/Macros/assemblyBrowser.aspx.designer.cs      | 2 +-
 umbraco/presentation/umbraco/developer/Packages/Boost.aspx | 2 +-
 .../umbraco/developer/Packages/Boost.aspx.designer.cs      | 2 +-
 .../umbraco/developer/Packages/installedPackage.aspx       | 2 +-
 .../developer/Packages/installedPackage.aspx.designer.cs   | 2 +-
 .../presentation/umbraco/developer/Packages/installer.aspx | 2 +-
 .../umbraco/developer/Packages/installer.aspx.designer.cs  | 2 +-
 umbraco/presentation/umbraco/dialogs/emptyTrashcan.aspx    | 2 +-
 .../umbraco/dialogs/emptyTrashcan.aspx.designer.cs         | 2 +-
 umbraco/presentation/umbraco/dialogs/publish.aspx          | 2 +-
 .../presentation/umbraco/dialogs/publish.aspx.designer.cs  | 2 +-
 umbraco/presentation/umbraco/dialogs/republish.aspx        | 2 +-
 .../umbraco/dialogs/republish.aspx.designer.cs             | 2 +-
 umbraco/presentation/umbraco/members/ViewMembers.aspx      | 3 +--
 .../umbraco/members/ViewMembers.aspx.designer.cs           | 2 +-
 umbraco/presentation/umbraco/treeInit.aspx                 | 2 +-
 umbraco/presentation/umbraco/treeInit.aspx.designer.cs     | 2 +-
 umbraco/presentation/umbraco/umbraco.aspx                  | 2 +-
 .../presentation/umbraco/users/PermissionsHandler.asmx.cs  | 5 ++++-
 .../umbraco_client/Application/UmbracoClientManager.js     | 5 +++--
 umbraco/umbraco.Legacy/umbraco.Legacy.csproj               | 5 ++++-
 27 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/UpgradeReadme.txt b/UpgradeReadme.txt
index a765191522..fff889ef2e 100644
--- a/UpgradeReadme.txt
+++ b/UpgradeReadme.txt
@@ -22,7 +22,7 @@ to use the UmbracoClientPath setting
 
 * All references to the old Client Dependency libraries have been removed completely.
 
-* Moved treeIcons.css to ~/umbraco_client/Tree/treeIcons.css
+* Moved treeIcons.css to ~/[UmbracoClientFolder]/Tree/treeIcons.css
 
 * Removed all IFormHandler dependencies and therefore removed the idea of FormHandlers all together:
 - IFormHandler
diff --git a/components/editorControls/umbraco.editorControls.csproj b/components/editorControls/umbraco.editorControls.csproj
index 831a0332fa..9d8a873412 100644
--- a/components/editorControls/umbraco.editorControls.csproj
+++ b/components/editorControls/umbraco.editorControls.csproj
@@ -1,7 +1,7 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
-    <ProductVersion>9.0.21022</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{255F5DF1-4E43-4758-AC05-7A0B68EB021B}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
diff --git a/umbraco/presentation/install/default.aspx b/umbraco/presentation/install/default.aspx
index 82dc91b489..e75dd8ef84 100644
--- a/umbraco/presentation/install/default.aspx
+++ b/umbraco/presentation/install/default.aspx
@@ -1,7 +1,7 @@
 <%@ Page Language="c#" CodeBehind="default.aspx.cs" AutoEventWireup="True" Inherits="umbraco.presentation.install._default" EnableViewState="False" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
-<%@ Register TagPrefix="ctl" Src="~/umbraco/controls/ProgressBar.ascx" TagName="ProgBar"  %>
+<%@ Register TagPrefix="ctl" Src="../umbraco/controls/ProgressBar.ascx" TagName="ProgBar"  %>
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" >
diff --git a/umbraco/presentation/install/default.aspx.designer.cs b/umbraco/presentation/install/default.aspx.designer.cs
index 4a7bd00d30..422fc0da6f 100644
--- a/umbraco/presentation/install/default.aspx.designer.cs
+++ b/umbraco/presentation/install/default.aspx.designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3074
+//     Runtime Version:2.0.50727.4927
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/umbraco/presentation/umbraco/create/xslt.ascx.cs b/umbraco/presentation/umbraco/create/xslt.ascx.cs
index 4e63a77c67..37a9653b9d 100644
--- a/umbraco/presentation/umbraco/create/xslt.ascx.cs
+++ b/umbraco/presentation/umbraco/create/xslt.ascx.cs
@@ -69,7 +69,7 @@ namespace umbraco.presentation.create
 					.ChildNodeCreated()
 					.CloseModalWindow();
 
-				//Page.ClientScript.RegisterClientScriptBlock(this.GetType(), "refresh", "<script type='text/javascript'>\ntop.right.location.href = '" + returnUrl + "';\ntop.refreshTree(false, true);\ntop.closeModal();</script>");
+
 
 
 			}
diff --git a/umbraco/presentation/umbraco/developer/Macros/assemblyBrowser.aspx b/umbraco/presentation/umbraco/developer/Macros/assemblyBrowser.aspx
index 9615a7387a..3cc6ef3f91 100644
--- a/umbraco/presentation/umbraco/developer/Macros/assemblyBrowser.aspx
+++ b/umbraco/presentation/umbraco/developer/Macros/assemblyBrowser.aspx
@@ -2,6 +2,9 @@
   Inherits="umbraco.developer.assemblyBrowser" %>
 <%@ Register TagPrefix="wc1" Namespace="umbraco.controls" Assembly="umbraco" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
+<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
+
+<umb:JsInclude ID="JsInclude6" runat="server" FilePath="Application/UmbracoClientManager.js" PathNameAlias="UmbracoClient"  />
 
 <asp:Content ContentPlaceHolderID="body" runat="server">
 <h3 style="MARGIN-LEFT: 0px"><asp:Label id="AssemblyName" runat="server"></asp:Label></h3>
@@ -24,9 +27,7 @@
 
 				    </p>
 
-<script type="text/javascript">
-	top.right.document.location.href = top.right.document.location.href;
-</script>
+
 </asp:Panel>
 
 </asp:Content>
diff --git a/umbraco/presentation/umbraco/developer/Macros/assemblyBrowser.aspx.designer.cs b/umbraco/presentation/umbraco/developer/Macros/assemblyBrowser.aspx.designer.cs
index 3dc6dee7ed..f2378a23eb 100644
--- a/umbraco/presentation/umbraco/developer/Macros/assemblyBrowser.aspx.designer.cs
+++ b/umbraco/presentation/umbraco/developer/Macros/assemblyBrowser.aspx.designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3053
+//     Runtime Version:2.0.50727.4927
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/umbraco/presentation/umbraco/developer/Packages/Boost.aspx b/umbraco/presentation/umbraco/developer/Packages/Boost.aspx
index 5f29842b37..cfe131ec3e 100644
--- a/umbraco/presentation/umbraco/developer/Packages/Boost.aspx
+++ b/umbraco/presentation/umbraco/developer/Packages/Boost.aspx
@@ -1,7 +1,7 @@
 <%@ Page Language="C#" AutoEventWireup="true" MasterPageFile="../../masterpages/umbracoPage.Master" Title="Install boost" CodeBehind="Boost.aspx.cs" Inherits="umbraco.presentation.developer.packages.Boost" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
-<%@ Register TagPrefix="ctl" Src="~/umbraco/controls/ProgressBar.ascx" TagName="ProgBar"  %>
+<%@ Register TagPrefix="ctl" Src="../../controls/ProgressBar.ascx" TagName="ProgBar"  %>
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
 
diff --git a/umbraco/presentation/umbraco/developer/Packages/Boost.aspx.designer.cs b/umbraco/presentation/umbraco/developer/Packages/Boost.aspx.designer.cs
index 24db5f6767..9030587891 100644
--- a/umbraco/presentation/umbraco/developer/Packages/Boost.aspx.designer.cs
+++ b/umbraco/presentation/umbraco/developer/Packages/Boost.aspx.designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3074
+//     Runtime Version:2.0.50727.4927
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/umbraco/presentation/umbraco/developer/Packages/installedPackage.aspx b/umbraco/presentation/umbraco/developer/Packages/installedPackage.aspx
index 1c566449ce..8322e922d2 100644
--- a/umbraco/presentation/umbraco/developer/Packages/installedPackage.aspx
+++ b/umbraco/presentation/umbraco/developer/Packages/installedPackage.aspx
@@ -1,6 +1,6 @@
 <%@ Page Language="C#" MasterPageFile="../../masterpages/umbracoPage.Master" AutoEventWireup="true" CodeBehind="installedPackage.aspx.cs" Inherits="umbraco.presentation.developer.packages.installedPackage" %>
 <%@ Register TagPrefix="cc2" Namespace="umbraco.uicontrols" Assembly="controls" %>
-<%@ Register TagPrefix="ctl" Src="~/umbraco/controls/ProgressBar.ascx" TagName="ProgBar"  %>
+<%@ Register TagPrefix="ctl" Src="../../controls/ProgressBar.ascx" TagName="ProgBar"  %>
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
   <script type="text/javascript">
diff --git a/umbraco/presentation/umbraco/developer/Packages/installedPackage.aspx.designer.cs b/umbraco/presentation/umbraco/developer/Packages/installedPackage.aspx.designer.cs
index ea7d0638eb..cf9ab7212d 100644
--- a/umbraco/presentation/umbraco/developer/Packages/installedPackage.aspx.designer.cs
+++ b/umbraco/presentation/umbraco/developer/Packages/installedPackage.aspx.designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3082
+//     Runtime Version:2.0.50727.4927
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/umbraco/presentation/umbraco/developer/Packages/installer.aspx b/umbraco/presentation/umbraco/developer/Packages/installer.aspx
index 8ff0b1da76..9cb10d0d2d 100644
--- a/umbraco/presentation/umbraco/developer/Packages/installer.aspx
+++ b/umbraco/presentation/umbraco/developer/Packages/installer.aspx
@@ -1,7 +1,7 @@
 <%@ Page Language="c#" MasterPageFile="../../masterpages/umbracoPage.Master" CodeBehind="installer.aspx.cs"
     AutoEventWireup="True" Inherits="umbraco.presentation.developer.packages.Installer"
     Trace="false" %>
-<%@ Register TagPrefix="ctl" Src="~/umbraco/controls/ProgressBar.ascx" TagName="ProgBar"  %>
+<%@ Register TagPrefix="ctl" Src="../../controls/ProgressBar.ascx" TagName="ProgBar"  %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <asp:Content ContentPlaceHolderID="head" runat="server">
 
diff --git a/umbraco/presentation/umbraco/developer/Packages/installer.aspx.designer.cs b/umbraco/presentation/umbraco/developer/Packages/installer.aspx.designer.cs
index 554436b414..d7666d361c 100644
--- a/umbraco/presentation/umbraco/developer/Packages/installer.aspx.designer.cs
+++ b/umbraco/presentation/umbraco/developer/Packages/installer.aspx.designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3082
+//     Runtime Version:2.0.50727.4927
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/umbraco/presentation/umbraco/dialogs/emptyTrashcan.aspx b/umbraco/presentation/umbraco/dialogs/emptyTrashcan.aspx
index 3b839c79f4..b792b73578 100644
--- a/umbraco/presentation/umbraco/dialogs/emptyTrashcan.aspx
+++ b/umbraco/presentation/umbraco/dialogs/emptyTrashcan.aspx
@@ -1,6 +1,6 @@
 <%@ Page Language="C#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="true" CodeBehind="emptyTrashcan.aspx.cs" Inherits="umbraco.presentation.dialogs.emptyTrashcan" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
-<%@ Register TagPrefix="ctl" Src="~/umbraco/controls/ProgressBar.ascx" TagName="ProgBar"  %>
+<%@ Register TagPrefix="ctl" Src="../controls/ProgressBar.ascx" TagName="ProgBar"  %>
 <asp:Content ContentPlaceHolderID="head" runat="server">
 		<script type="text/javascript">
 		
diff --git a/umbraco/presentation/umbraco/dialogs/emptyTrashcan.aspx.designer.cs b/umbraco/presentation/umbraco/dialogs/emptyTrashcan.aspx.designer.cs
index e971dec780..b3d154f29c 100644
--- a/umbraco/presentation/umbraco/dialogs/emptyTrashcan.aspx.designer.cs
+++ b/umbraco/presentation/umbraco/dialogs/emptyTrashcan.aspx.designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3082
+//     Runtime Version:2.0.50727.4927
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/umbraco/presentation/umbraco/dialogs/publish.aspx b/umbraco/presentation/umbraco/dialogs/publish.aspx
index e9f9900f9b..32ac97e4fe 100644
--- a/umbraco/presentation/umbraco/dialogs/publish.aspx
+++ b/umbraco/presentation/umbraco/dialogs/publish.aspx
@@ -1,7 +1,7 @@
 <%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" Codebehind="publish.aspx.cs" AutoEventWireup="True" Inherits="umbraco.dialogs.publish" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
-<%@ Register TagPrefix="ctl" Src="~/umbraco/controls/ProgressBar.ascx" TagName="ProgBar"  %>
+<%@ Register TagPrefix="ctl" Src="../controls/ProgressBar.ascx" TagName="ProgBar"  %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
 
diff --git a/umbraco/presentation/umbraco/dialogs/publish.aspx.designer.cs b/umbraco/presentation/umbraco/dialogs/publish.aspx.designer.cs
index 218886f2cd..dc94de74f1 100644
--- a/umbraco/presentation/umbraco/dialogs/publish.aspx.designer.cs
+++ b/umbraco/presentation/umbraco/dialogs/publish.aspx.designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3053
+//     Runtime Version:2.0.50727.4927
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/umbraco/presentation/umbraco/dialogs/republish.aspx b/umbraco/presentation/umbraco/dialogs/republish.aspx
index ad9c2c275c..42e1ee8ba9 100644
--- a/umbraco/presentation/umbraco/dialogs/republish.aspx
+++ b/umbraco/presentation/umbraco/dialogs/republish.aspx
@@ -1,5 +1,5 @@
 <%@ Page Language="c#" Codebehind="republish.aspx.cs" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="True" Inherits="umbraco.cms.presentation.republish" %>
-<%@ Register TagPrefix="ctl" Src="~/umbraco/controls/ProgressBar.ascx" TagName="ProgBar"  %>
+<%@ Register TagPrefix="ctl" Src="../controls/ProgressBar.ascx" TagName="ProgBar"  %>
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
    <script type="text/javascript">
diff --git a/umbraco/presentation/umbraco/dialogs/republish.aspx.designer.cs b/umbraco/presentation/umbraco/dialogs/republish.aspx.designer.cs
index 0e99f8fbad..51fd4c0b63 100644
--- a/umbraco/presentation/umbraco/dialogs/republish.aspx.designer.cs
+++ b/umbraco/presentation/umbraco/dialogs/republish.aspx.designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3082
+//     Runtime Version:2.0.50727.4927
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/umbraco/presentation/umbraco/members/ViewMembers.aspx b/umbraco/presentation/umbraco/members/ViewMembers.aspx
index 1f0cf06d1a..b479c76228 100644
--- a/umbraco/presentation/umbraco/members/ViewMembers.aspx
+++ b/umbraco/presentation/umbraco/members/ViewMembers.aspx
@@ -1,5 +1,4 @@
-<%@ Page Title="" Language="C#" MasterPageFile="~/umbraco/masterpages/umbracoPage.Master"
-  AutoEventWireup="true" CodeBehind="ViewMembers.aspx.cs" Inherits="umbraco.presentation.members.ViewMembers" %>
+<%@ Page Title="" Language="C#" MasterPageFile="../masterpages/umbracoPage.Master" AutoEventWireup="true" CodeBehind="ViewMembers.aspx.cs" Inherits="umbraco.presentation.members.ViewMembers" %>
 
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <asp:Content ID="Content2" ContentPlaceHolderID="body" runat="server">
diff --git a/umbraco/presentation/umbraco/members/ViewMembers.aspx.designer.cs b/umbraco/presentation/umbraco/members/ViewMembers.aspx.designer.cs
index bee293f98e..996a4712ac 100644
--- a/umbraco/presentation/umbraco/members/ViewMembers.aspx.designer.cs
+++ b/umbraco/presentation/umbraco/members/ViewMembers.aspx.designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3053
+//     Runtime Version:2.0.50727.4927
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/umbraco/presentation/umbraco/treeInit.aspx b/umbraco/presentation/umbraco/treeInit.aspx
index a986a6203c..f21ba44160 100644
--- a/umbraco/presentation/umbraco/treeInit.aspx
+++ b/umbraco/presentation/umbraco/treeInit.aspx
@@ -1,5 +1,5 @@
 <%@ Page Language="c#" CodeBehind="treeInit.aspx.cs" AutoEventWireup="True" Inherits="umbraco.cms.presentation.TreeInit" %>
-<%@ Register Src="~/umbraco/controls/TreeControl.ascx" TagName="TreeControl" TagPrefix="umbraco" %>
+<%@ Register Src="controls/TreeControl.ascx" TagName="TreeControl" TagPrefix="umbraco" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 
diff --git a/umbraco/presentation/umbraco/treeInit.aspx.designer.cs b/umbraco/presentation/umbraco/treeInit.aspx.designer.cs
index 7ff8c7da0f..3bbaa87721 100644
--- a/umbraco/presentation/umbraco/treeInit.aspx.designer.cs
+++ b/umbraco/presentation/umbraco/treeInit.aspx.designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:2.0.50727.3053
+//     Runtime Version:2.0.50727.4927
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
diff --git a/umbraco/presentation/umbraco/umbraco.aspx b/umbraco/presentation/umbraco/umbraco.aspx
index e69ef73f1f..6bdac7f28d 100644
--- a/umbraco/presentation/umbraco/umbraco.aspx
+++ b/umbraco/presentation/umbraco/umbraco.aspx
@@ -1,6 +1,6 @@
 <%@ Page Trace="false" Language="c#" CodeBehind="umbraco.aspx.cs" AutoEventWireup="True" Inherits="umbraco.cms.presentation._umbraco" ClientTarget="uplevel" %>
 
-<%@ Register Src="~/umbraco/controls/TreeControl.ascx" TagName="TreeControl" TagPrefix="umbraco" %>
+<%@ Register Src="controls/TreeControl.ascx" TagName="TreeControl" TagPrefix="umbraco" %>
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="uc1" TagName="quickSearch" Src="Search/QuickSearch.ascx" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
diff --git a/umbraco/presentation/umbraco/users/PermissionsHandler.asmx.cs b/umbraco/presentation/umbraco/users/PermissionsHandler.asmx.cs
index 1be5d48305..2908e04745 100644
--- a/umbraco/presentation/umbraco/users/PermissionsHandler.asmx.cs
+++ b/umbraco/presentation/umbraco/users/PermissionsHandler.asmx.cs
@@ -39,7 +39,10 @@ namespace umbraco.cms.presentation.user
             Authorize();
 
             Page page = new Page();
-            NodePermissions nodePermissions = page.LoadControl("~/umbraco/users/NodePermissions.ascx") as NodePermissions;
+
+            string path = umbraco.GlobalSettings.Path + "/users/NodePermissions.ascx";
+            NodePermissions nodePermissions = page.LoadControl(path) as NodePermissions;
+
             nodePermissions.UserID = userID;
             nodePermissions.NodeID = toIntArray(nodes);
             nodePermissions.ID = "nodePermissions";
diff --git a/umbraco/presentation/umbraco_client/Application/UmbracoClientManager.js b/umbraco/presentation/umbraco_client/Application/UmbracoClientManager.js
index 2449e032b2..4b58e9f813 100644
--- a/umbraco/presentation/umbraco_client/Application/UmbracoClientManager.js
+++ b/umbraco/presentation/umbraco_client/Application/UmbracoClientManager.js
@@ -14,7 +14,7 @@ Umbraco.Sys.registerNamespace("Umbraco.Application");
 
         return {
             _isDirty: false,
-            _debug: false,
+            _isDebug: true,
             _mainTree: null,
             _appActions: null,
             _rootPath: "/umbraco", //this is the default
@@ -23,7 +23,8 @@ Umbraco.Sys.registerNamespace("Umbraco.Application");
                 /// <summary>
                 /// sets the Umbraco root path folder
                 /// </summary>
-                _rootPath = strPath;
+                this._debug("setUmbracoPath: " + strPath);
+                this._rootPath = strPath;
             },
 
             mainWindow: function() {
diff --git a/umbraco/umbraco.Legacy/umbraco.Legacy.csproj b/umbraco/umbraco.Legacy/umbraco.Legacy.csproj
index ed633b1904..2c58256343 100644
--- a/umbraco/umbraco.Legacy/umbraco.Legacy.csproj
+++ b/umbraco/umbraco.Legacy/umbraco.Legacy.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
+    <ProductVersion>9.0.30729</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{27A2590E-1313-4A33-89FD-92811540B69C}</ProjectGuid>
     <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
@@ -1011,6 +1011,9 @@
           <IISUrl>
           </IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
+          <UseCustomServer>False</UseCustomServer>
+          <CustomServerUrl>
+          </CustomServerUrl>
           <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
         </WebProjectProperties>
       </FlavorProperties>