From d8338df357eb168e044a606b7f7601ae17b828e6 Mon Sep 17 00:00:00 2001
From: Benedek Farkas <benedek.farkas@lombiq.com>
Date: Fri, 10 Nov 2017 01:01:21 +0100
Subject: [PATCH] Fixing auto-merge errors

---
 .../Modules/Orchard.MediaLibrary/Services/XmlRpcHandler.cs      | 1 +
 .../Modules/Orchard.Taxonomies/Handlers/TaxonomyPartHandler.cs  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Services/XmlRpcHandler.cs b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Services/XmlRpcHandler.cs
index 17f87af58..432c59abd 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Services/XmlRpcHandler.cs
+++ b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Services/XmlRpcHandler.cs
@@ -61,6 +61,7 @@ namespace Orchard.MediaLibrary.Services {
             UrlHelper url) {
 
             List<LocalizedString> validationErrors;
+            var user = _membershipService.ValidateUser(userName, password, out validationErrors);
             if (!_authorizationService.TryCheckAccess(Permissions.ManageOwnMedia, user, null)
                 && !_authorizationService.TryCheckAccess(Permissions.EditMediaContent, user, null)) {
                 throw new OrchardCoreException(T("Access denied"));
diff --git a/src/Orchard.Web/Modules/Orchard.Taxonomies/Handlers/TaxonomyPartHandler.cs b/src/Orchard.Web/Modules/Orchard.Taxonomies/Handlers/TaxonomyPartHandler.cs
index c5e6c7c3f..067c4d349 100644
--- a/src/Orchard.Web/Modules/Orchard.Taxonomies/Handlers/TaxonomyPartHandler.cs
+++ b/src/Orchard.Web/Modules/Orchard.Taxonomies/Handlers/TaxonomyPartHandler.cs
@@ -25,7 +25,7 @@ namespace Orchard.Taxonomies.Handlers {
             Filters.Add(StorageFilter.For(repository));
             OnPublished<TaxonomyPart>((context, part) => {
 
-                if (String.IsNullOrWhiteSpace(part.TermTypeName)) {
+                if (string.IsNullOrWhiteSpace(part.TermTypeName)) {
                     // is it a new taxonomy ?
                     taxonomyService.CreateTermContentType(part);
                 }