yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch origin/dev-v7 into temp8

Browse Source
This commit is contained in:
Stephan
2018-09-06 13:07:09 +02:00
parent 2ae9405fcf 5dd04d9a3e
commit 612c38654d
76 changed files with 1607 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web/Trees/ApplicationTreeController.cs
View File

@@ -30,6 +30,8 @@ namespace Umbraco.Web.Trees
[HttpQueryStringFilter("queryStrings")]
public async Task<SectionRootNode> GetApplicationTrees(string application, string tree, FormDataCollection queryStrings, bool onlyInitialized = true)
{
application = application.CleanForXss();
if (string.IsNullOrEmpty(application)) throw new HttpResponseException(HttpStatusCode.NotFound);
var rootId = Constants.System.Root.ToString(CultureInfo.InvariantCulture);
@@ -37,7 +39,7 @@ namespace Umbraco.Web.Trees
//find all tree definitions that have the current application alias
var appTrees = Services.ApplicationTreeService.GetApplicationTrees(application, onlyInitialized).ToArray();
if (appTrees.Length == 1 || string.IsNullOrEmpty(tree) == false )
if (string.IsNullOrEmpty(tree) == false || appTrees.Length <= 1)
{
var apptree = string.IsNullOrEmpty(tree) == false
? appTrees.SingleOrDefault(x => x.Alias == tree)