lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-24 01:49:12 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixing auto-merge errors

Browse Source
This commit is contained in:
Benedek Farkas
2017-11-10 01:01:21 +01:00
parent 7599a25594
commit d8338df357
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Orchard.Web/Modules/Orchard.MediaLibrary/Services/XmlRpcHandler.cs
View File

@@ -61,6 +61,7 @@ namespace Orchard.MediaLibrary.Services {
UrlHelper url) { UrlHelper url) {
List<LocalizedString> validationErrors; List<LocalizedString> validationErrors;
var user = _membershipService.ValidateUser(userName, password, out validationErrors);
if (!_authorizationService.TryCheckAccess(Permissions.ManageOwnMedia, user, null) if (!_authorizationService.TryCheckAccess(Permissions.ManageOwnMedia, user, null)
&& !_authorizationService.TryCheckAccess(Permissions.EditMediaContent, user, null)) { && !_authorizationService.TryCheckAccess(Permissions.EditMediaContent, user, null)) {
throw new OrchardCoreException(T("Access denied")); throw new OrchardCoreException(T("Access denied"));

2
src/Orchard.Web/Modules/Orchard.Taxonomies/Handlers/TaxonomyPartHandler.cs
View File

@@ -25,7 +25,7 @@ namespace Orchard.Taxonomies.Handlers {
Filters.Add(StorageFilter.For(repository)); Filters.Add(StorageFilter.For(repository));
OnPublished<TaxonomyPart>((context, part) => { OnPublished<TaxonomyPart>((context, part) => {
if (String.IsNullOrWhiteSpace(part.TermTypeName)) { if (string.IsNullOrWhiteSpace(part.TermTypeName)) {
// is it a new taxonomy ? // is it a new taxonomy ?
taxonomyService.CreateTermContentType(part); taxonomyService.CreateTermContentType(part);
} }