Merge with 6.0.3

This commit is contained in:
Shannon Deminick
2013-03-21 20:39:33 +06:00
36 changed files with 6979 additions and 562 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -1,12 +1,13 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Web;
using Umbraco.Core.Logging;
using umbraco.IO;
namespace umbraco.cms.businesslogic.packager {
public class InstalledPackage {
public class InstalledPackage
{
private int _saveHitCount = 0;
public static InstalledPackage GetById(int id) {
InstalledPackage pack = new InstalledPackage();
@@ -27,7 +28,12 @@ namespace umbraco.cms.businesslogic.packager {
return pack;
}
public void Save() {
public void Save()
{
#if DEBUG
_saveHitCount++;
LogHelper.Info<InstalledPackage>("The InstalledPackage class save method has been hit " + _saveHitCount + " times.");
#endif
this.FireBeforeSave(EventArgs.Empty);
data.Save(this.Data, IOHelper.MapPath(Settings.InstalledPackagesSettings));
this.FireAfterSave(EventArgs.Empty);

View File

@@ -158,6 +158,7 @@
<Project>{511F6D8D-7717-440A-9A57-A507E9A8B27F}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
</ProjectReference>
<Reference Include="System.Xml.Linq" />
<Reference Include="TidyNet, Version=1.0.0.0, Culture=neutral">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Tidy.Net.1.0.0\lib\TidyNet.dll</HintPath>