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

Merge remote-tracking branch 'origin/release/12.3.4' into v12/dev

Browse Source 
# Conflicts:
#	version.json
This commit is contained in:
Bjarke Berg
2023-12-08 13:34:41 +01:00
parent a31d4746b3 da6aaa07db
commit cf2ec50d15
6 changed files with 70 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Infrastructure/PropertyEditors/ValueConverters/MultiUrlPickerValueConverter.cs
View File

@@ -185,6 +185,7 @@ public class MultiUrlPickerValueConverter : PropertyValueConverterBase, IDeliver
? null
: ApiLink.Content(
item.Name.IfNullOrWhiteSpace(_apiContentNameProvider.GetName(content)),
item.QueryString,
item.Target,
content.Key,
content.ContentType.Alias,
@@ -195,12 +196,13 @@ public class MultiUrlPickerValueConverter : PropertyValueConverterBase, IDeliver
? null
: ApiLink.Media(
item.Name.IfNullOrWhiteSpace(_apiContentNameProvider.GetName(media)),
_apiMediaUrlProvider.GetUrl(media),
$"{_apiMediaUrlProvider.GetUrl(media)}{item.QueryString}",
item.QueryString,
item.Target,
media.Key,
media.ContentType.Alias);
default:
return ApiLink.External(item.Name, $"{item.Url}{item.QueryString}", item.Target);
return ApiLink.External(item.Name, $"{item.Url}{item.QueryString}", item.QueryString, item.Target);
}
}