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

Merge with 6.0.1

Browse Source
This commit is contained in:
Shannon Deminick
2013-02-14 02:37:23 +06:00
parent 41c952a2fa b101e25e7a
commit d104ea1b57
7 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Models/ContentTypeCompositionBase.cs
View File

@@ -89,7 +89,7 @@ namespace Umbraco.Core.Models
/// <returns>True if ContentType was removed, otherwise returns False</returns>
public bool RemoveContentType(string alias)
{
if (!ContentTypeCompositionExists(alias))
if (ContentTypeCompositionExists(alias))
{
var contentTypeComposition = ContentTypeComposition.First(x => x.Alias == alias);
return _contentTypeComposition.Remove(contentTypeComposition);

2
src/Umbraco.Core/Models/Membership/IUser.cs
View File

@@ -12,7 +12,7 @@ namespace Umbraco.Core.Models.Membership
int SessionTimeout { get; set; }
int StartContentId { get; set; }
int StartMediaId { get; set; }
string Lanuguage { get; set; }
string Language { get; set; }
bool DefaultToLiveEditing { get; set; }
IEnumerable<string> Applications { get; set; }
bool NoConsole { get; set; }

2
src/Umbraco.Core/Models/Membership/User.cs
View File

@@ -88,7 +88,7 @@ namespace Umbraco.Core.Models.Membership
#region Implementation of IUser
[DataMember]
public string Lanuguage { get; set; }
public string Language { get; set; }
[DataMember]
public string Permissions { get; set; }
[DataMember]