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

Fixes merge issue, changed to version 4.11.8, removes post build copy (thought that was removed a long time ago)

Browse Source
This commit is contained in:
Shannon Deminick
2013-04-25 13:44:17 -10:00
parent 4a619967bd
commit 32fa920279
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@ namespace Umbraco.Core.Configuration
#region Private static fields
// CURRENT UMBRACO VERSION ID
private const string CurrentUmbracoVersion = "4.11.7";
private const string CurrentUmbracoVersion = "4.11.8";
private static readonly object Locker = new object();
//make this volatile so that we can ensure thread safety with a double check lock

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

@@ -2154,11 +2154,8 @@
<PropertyGroup>
<PreBuildEvent>
</PreBuildEvent>
<PostBuildEvent>xcopy /s /y "$(ProjectDir)umbraco.presentation\*.aspx" "$(ProjectDir)..\Umbraco.Web.UI\"
xcopy /s /y "$(ProjectDir)umbraco.presentation\*.ascx" "$(ProjectDir)..\Umbraco.Web.UI\"
xcopy /s /y "$(ProjectDir)umbraco.presentation\*.asmx" "$(ProjectDir)..\Umbraco.Web.UI\"
xcopy /s /y "$(ProjectDir)umbraco.presentation\*.ashx" "$(ProjectDir)..\Umbraco.Web.UI\"
xcopy /s /y "$(ProjectDir)umbraco.presentation\*.master" "$(ProjectDir)..\Umbraco.Web.UI\"</PostBuildEvent>
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />

4
src/Umbraco.Web/umbraco.presentation/umbraco/create/MediaTypeTasks.cs
View File

@@ -12,8 +12,8 @@ namespace umbraco
var mediaType = cms.businesslogic.media.MediaType.MakeNew(User, Alias.Replace("'", "''"));
mediaType.IconUrl = UmbracoSettings.IconPickerBehaviour == IconPickerBehaviour.HideFileDuplicates ? ".sprTreeFolder" : "folder.gif";
m_returnUrl = string.Format("settings/editMediaType.aspx?id={0}", mediaType.Id);
_returnUrl = string.Format("settings/editMediaType.aspx?id={0}", mediaType.Id);
return true;
}