Merge branch '7.1.0-installer' of https://github.com/umbraco/Umbraco-CMS into 7.1.0-installer

2014-02-27 10:16:45 +01:00
parent 3b71a6c3a5 9c4212703b
commit 3fc96a45a6
4 changed files with 52 additions and 25 deletions
--- a/src/Umbraco.Web/Install/Controllers/InstallController.cs
+++ b/src/Umbraco.Web/Install/Controllers/InstallController.cs
@@ -64,6 +64,9 @@ namespace Umbraco.Web.Install.Controllers

            //gen the install base url
            ViewBag.InstallApiBaseUrl = Url.GetUmbracoApiService("GetSetup", "InstallApi", "install").TrimEnd("GetSetup");
+            
+            //get the base umbraco folder
+            ViewBag.UmbracoBaseFolder = SystemDirectories.Umbraco;

            return View();
        }