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.0.0

Browse Source 
Conflicts:
	src/Umbraco.Web.UI/umbraco/members/EditMember.aspx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
This commit is contained in:
Shannon
2013-11-07 12:30:28 +11:00
parent ceab957db5 fc0654a80f
commit fad84ac0bb
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Umbraco.Core/SystemUtilities.cs
View File

@@ -8,6 +8,8 @@ namespace Umbraco.Core
/// </summary>
public static class SystemUtilities
{
private static bool _knowTrustLevel;
private static AspNetHostingPermissionLevel _trustLevel;
/// <summary>
/// Get the current trust level of the hosted application
@@ -15,6 +17,8 @@ namespace Umbraco.Core
/// <returns></returns>
public static AspNetHostingPermissionLevel GetCurrentTrustLevel()
{
if (_knowTrustLevel) return _trustLevel;
foreach (var trustLevel in new[] {
AspNetHostingPermissionLevel.Unrestricted,
AspNetHostingPermissionLevel.High,
@@ -31,10 +35,14 @@ namespace Umbraco.Core
continue;
}
return trustLevel;
_trustLevel = trustLevel;
_knowTrustLevel = true;
return _trustLevel;
}
return AspNetHostingPermissionLevel.None;
}
_trustLevel = AspNetHostingPermissionLevel.None;
_knowTrustLevel = true;
return _trustLevel;
}
}
}

2
src/Umbraco.Web.UI/umbraco/config/lang/en.xml
View File

@@ -308,7 +308,7 @@
<key alias="alias">Alias</key>
<key alias="areyousure">Are you sure?</key>
<key alias="border">Border</key>
<key alias="by">or</key>
<key alias="by">by</key>
<key alias="cancel">Cancel</key>
<key alias="cellMargin">Cell margin</key>
<key alias="choose">Choose</key>

2
src/Umbraco.Web/Umbraco.Web.csproj
View File

@@ -1949,8 +1949,6 @@
<Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltChooseExtension.aspx" />
<Content Include="umbraco.presentation\umbraco\developer\Xslt\xsltInsertValueOf.aspx" />
<Content Include="umbraco.presentation\umbraco\js\language.aspx">
<SubType>ASPXCodeBehind</SubType>
</Content>
<Content Include="umbraco.presentation\umbraco\members\EditMemberGroup.aspx">
<SubType>Form</SubType>
</Content>

2
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs
View File

@@ -34,7 +34,7 @@ namespace umbraco.presentation.dialogs
Document rollback = new Document(currentDoc.Id, new Guid(allVersions.SelectedValue));
propertiesCompare.Text = "<tr><th style='width: 25%;' valign='top'>" + ui.Text("general", "name") + ":</th><td>" + rollback.Text + "</td></tr>";
propertiesCompare.Text += "<tr><th style='width: 25%;' valign='top'>" + ui.Text("content", "createDate") + ":</th><td>" + rollback.VersionDate.ToLongDateString() + " " + rollback.VersionDate.ToLongTimeString() + ui.Text("general", "by") + ": " + rollback.User.Name + "</td></tr>";
propertiesCompare.Text += "<tr><th style='width: 25%;' valign='top'>" + ui.Text("content", "createDate") + ":</th><td>" + rollback.VersionDate.ToLongDateString() + " " + rollback.VersionDate.ToLongTimeString() + " " + ui.Text("general", "by") + ": " + rollback.User.Name + "</td></tr>";
if (rbl_mode.SelectedValue == "diff")
lt_notice.Text = ui.Text("rollback", "diffHelp");