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

Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

Browse Source 
Conflicts:
	src/Umbraco.Core/Configuration/UmbracoSettings.cs
This commit is contained in:
Shannon
2014-03-18 18:53:04 +11:00
parent fd14065f14 caad775399
commit 02481dcfba
5 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Core/Configuration/GlobalSettings.cs
View File

@@ -287,11 +287,11 @@ namespace Umbraco.Core.Configuration
{
get
{
return IsConfiguredMembershipProviderUsingLegacyEncoding(Constants.Conventions.User.UmbracoUsersProviderName);
return IsConfiguredMembershipProviderUsingLegacyEncoding(UmbracoSettings.DefaultBackofficeProvider);
}
set
{
SetMembershipProvidersLegacyEncoding(Constants.Conventions.User.UmbracoUsersProviderName, value);
SetMembershipProvidersLegacyEncoding(UmbracoSettings.DefaultBackofficeProvider, value);
}
}

11
src/Umbraco.Core/Constants-Conventions.cs
View File

@@ -93,16 +93,7 @@ namespace Umbraco.Core
/// </summary>
public const string Image = "Image";
}
/// <summary>
/// Constants for Umbraco user
/// </summary>
public static class User
{
public static readonly string UmbracoUsersProviderName = "UsersMembershipProvider";
}
/// <summary>
/// Constants for Umbraco Member property aliases.
/// </summary>

7
src/Umbraco.Core/Security/MembershipProviderExtensions.cs
View File

@@ -8,6 +8,7 @@ using System.Threading.Tasks;
using System.Web;
using System.Web.Hosting;
using System.Web.Security;
using Umbraco.Core.Configuration;
using Umbraco.Core.Security;
namespace Umbraco.Core.Security
@@ -54,11 +55,11 @@ namespace Umbraco.Core.Security
/// <returns></returns>
public static MembershipProvider GetUsersMembershipProvider()
{
if (Membership.Providers[Constants.Conventions.User.UmbracoUsersProviderName] == null)
if (Membership.Providers[UmbracoSettings.DefaultBackofficeProvider] == null)
{
throw new InvalidOperationException("No membership provider found with name " + Constants.Conventions.User.UmbracoUsersProviderName);
throw new InvalidOperationException("No membership provider found with name " + UmbracoSettings.DefaultBackofficeProvider);
}
return Membership.Providers[Constants.Conventions.User.UmbracoUsersProviderName];
return Membership.Providers[UmbracoSettings.DefaultBackofficeProvider];
}
public static MembershipUser GetCurrentUser(this MembershipProvider membershipProvider)