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

Merge with 6.0.0

Browse Source
This commit is contained in:
Shannon Deminick
2012-12-14 08:07:39 +05:00
parent a37abbe622 a41e0323df
commit 1a5285dfa0
14 changed files with 103 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/NuSpecs/UmbracoCms.Core.nuspec
View File

@@ -17,6 +17,7 @@
<dependencies>
<dependency id="Microsoft.AspNet.Mvc" version="[4.0.20710.0]" />
<dependency id="ServiceStack.Text" version="3.9.21" />
<dependency id="Microsoft.AspNet.Mvc.FixedDisplayModes" version="1.0.0" />
</dependencies>
</metadata>
<files>

50
src/Umbraco.Core/Configuration/ClientDependencyConfiguration.cs Normal file
View File

@@ -0,0 +1,50 @@
using System;
using System.Linq;
using System.Xml.Linq;
using Umbraco.Core.IO;
using Umbraco.Core.Logging;
namespace Umbraco.Core.Configuration
{
internal class ClientDependencyConfiguration
{
private readonly string _fileName;
public ClientDependencyConfiguration()
{
_fileName = IOHelper.MapPath(string.Format("{0}/ClientDependency.config", SystemDirectories.Config));
}
/// <summary>
/// Increases the version number in ClientDependency.config by 1
/// </summary>
internal bool IncreaseVersionNumber()
{
try
{
var clientDependencyConfigXml = XDocument.Load(_fileName, LoadOptions.PreserveWhitespace);
if (clientDependencyConfigXml.Root != null)
{
var versionAttribute = clientDependencyConfigXml.Root.Attribute("version");
int oldVersion;
int.TryParse(versionAttribute.Value, out oldVersion);
var newVersion = oldVersion + 1;
versionAttribute.SetValue(newVersion);
clientDependencyConfigXml.Save(_fileName, SaveOptions.DisableFormatting);
LogHelper.Info<ClientDependencyConfiguration>(string.Format("Updated version number from {0} to {1}", oldVersion, newVersion));
return true;
}
}
catch (Exception ex)
{
LogHelper.Error<ClientDependencyConfiguration>("Couldn't update ClientDependency version number", ex);
}
return false;
}
}
}

10
src/Umbraco.Core/IO/IOHelper.cs
View File

@@ -222,7 +222,7 @@ namespace Umbraco.Core.IO
{
foreach (var character in Path.GetInvalidFileNameChars())
{
filePath = filePath.Replace(character, '_');
filePath = filePath.Replace(character, '-');
}
}
else
@@ -242,10 +242,14 @@ namespace Umbraco.Core.IO
if (reservedCharacters.IndexOf(character) == -1)
stringBuilder.Append(character);
else
stringBuilder.Append("_");
stringBuilder.Append("-");
}
return stringBuilder.ToString();
// Remove repeating dashes
// From: http://stackoverflow.com/questions/5111967/regex-to-remove-a-specific-repeated-character
var reducedString = Regex.Replace(stringBuilder.ToString(), "-+", "-");
return reducedString;
}
}
}

1
src/Umbraco.Core/Umbraco.Core.csproj
View File

@@ -105,6 +105,7 @@
<Compile Include="CodeAnnotations\UmbracoWillObsoleteAttribute.cs" />
<Compile Include="CodeAnnotations\UmbracoExperimentalFeatureAttribute.cs" />
<Compile Include="CodeAnnotations\UmbracoProposedPublicAttribute.cs" />
<Compile Include="Configuration\ClientDependencyConfiguration.cs" />
<Compile Include="Configuration\FileSystemProviderElement.cs" />
<Compile Include="Configuration\FileSystemProviderElementCollection.cs" />
<Compile Include="Configuration\FileSystemProvidersSection.cs" />

4
src/Umbraco.Tests/PluginManagerTests.cs
View File

@@ -268,7 +268,7 @@ namespace Umbraco.Tests
public void Resolves_Attributed_Trees()
{
var trees = PluginManager.Current.ResolveAttributedTrees();
Assert.AreEqual(27, trees.Count());
Assert.AreEqual(25, trees.Count());
}
[Test]
@@ -282,7 +282,7 @@ namespace Umbraco.Tests
public void Resolves_Trees()
{
var trees = PluginManager.Current.ResolveTrees();
Assert.AreEqual(36, trees.Count());
Assert.AreEqual(34, trees.Count());
}
[Test]

31
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -399,6 +399,7 @@
<DependentUpon>UI.xml</DependentUpon>
</None>
<Content Include="Global.asax" />
<Content Include="Umbraco\Config\Lang\en_us.xml" />
<Content Include="Umbraco\Config\Lang\he.xml" />
<Content Include="Umbraco\Config\Lang\ja.xml" />
<Content Include="Umbraco\Config\Lang\pl.xml" />
@@ -639,6 +640,7 @@
<Content Include="Umbraco_Client\Tinymce3\Langs\da.js" />
<Content Include="Umbraco_Client\Tinymce3\Langs\de.js" />
<Content Include="Umbraco_Client\Tinymce3\Langs\en.js" />
<Content Include="Umbraco_Client\Tinymce3\Langs\en_us.js" />
<Content Include="Umbraco_Client\Tinymce3\Langs\fi.js" />
<Content Include="Umbraco_Client\Tinymce3\Langs\fr.js" />
<Content Include="Umbraco_Client\Tinymce3\Langs\he.js" />
@@ -658,6 +660,7 @@
<Content Include="Umbraco_Client\Tinymce3\Plugins\Advhr\Langs\da_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Advhr\Langs\de_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Advhr\Langs\en_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Advhr\Langs\en_us_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Advhr\Langs\fi_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Advhr\Langs\fr_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Advhr\Langs\he_dlg.js" />
@@ -679,6 +682,7 @@
<Content Include="Umbraco_Client\Tinymce3\Plugins\Advimage\Langs\da_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Advimage\Langs\de_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Advimage\Langs\en_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Advimage\Langs\en_us_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Advimage\Langs\fi_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Advimage\Langs\fr_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Advimage\Langs\he_dlg.js" />
@@ -697,6 +701,7 @@
<Content Include="Umbraco_Client\Tinymce3\Plugins\Advlink\Langs\da_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Advlink\Langs\de_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Advlink\Langs\en_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Advlink\Langs\en_us_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Advlink\Langs\fi_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Advlink\Langs\fr_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Advlink\Langs\he_dlg.js" />
@@ -718,6 +723,7 @@
<Content Include="Umbraco_Client\Tinymce3\Plugins\Autosave\editor_plugin.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Autosave\editor_plugin_src.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Autosave\Langs\en.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Autosave\Langs\en_us.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Bbcode\editor_plugin.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Bbcode\editor_plugin_src.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Contextmenu\editor_plugin.js" />
@@ -747,6 +753,7 @@
<Content Include="Umbraco_Client\Tinymce3\Plugins\Emotions\Langs\da_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Emotions\Langs\de_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Emotions\Langs\en_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Emotions\Langs\en_us_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Emotions\Langs\fi_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Emotions\Langs\fr_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Emotions\Langs\he_dlg.js" />
@@ -775,6 +782,7 @@
<Content Include="Umbraco_Client\Tinymce3\Plugins\Fullpage\Langs\da_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Fullpage\Langs\de_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Fullpage\Langs\en_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Fullpage\Langs\en_us_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Fullpage\Langs\fi_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Fullpage\Langs\fr_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Fullpage\Langs\he_dlg.js" />
@@ -827,13 +835,20 @@
<Content Include="Umbraco_Client\Tinymce3\Plugins\Media\Langs\da_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Media\Langs\de_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Media\Langs\en_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Media\Langs\en_us_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Media\Langs\es_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Media\Langs\fi_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Media\Langs\fr_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Media\Langs\he_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Media\Langs\it_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Media\Langs\ja_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Media\Langs\ko_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Media\Langs\nl_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Media\Langs\no_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Media\Langs\pl_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Media\Langs\pt_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Media\Langs\sv_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Media\Langs\zh_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Media\media.htm" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Media\moxieplayer.swf" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Nonbreaking\editor_plugin.js" />
@@ -849,6 +864,7 @@
<Content Include="Umbraco_Client\Tinymce3\Plugins\Paste\Langs\da_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Paste\Langs\de_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Paste\Langs\en_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Paste\Langs\en_us_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Paste\Langs\fi_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Paste\Langs\fr_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Paste\Langs\he_dlg.js" />
@@ -878,6 +894,7 @@
<Content Include="Umbraco_Client\Tinymce3\Plugins\Searchreplace\Langs\da_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Searchreplace\Langs\de_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Searchreplace\Langs\en_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Searchreplace\Langs\en_us_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Searchreplace\Langs\fi_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Searchreplace\Langs\fr_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Searchreplace\Langs\he_dlg.js" />
@@ -901,6 +918,7 @@
<Content Include="Umbraco_Client\Tinymce3\Plugins\Style\Langs\da_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Style\Langs\de_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Style\Langs\en_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Style\Langs\en_us_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Style\Langs\fi_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Style\Langs\fr_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Style\Langs\he_dlg.js" />
@@ -929,6 +947,7 @@
<Content Include="Umbraco_Client\Tinymce3\Plugins\Table\Langs\da_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Table\Langs\de_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Table\Langs\en_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Table\Langs\en_us_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Table\Langs\fi_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Table\Langs\fr_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Table\Langs\he_dlg.js" />
@@ -951,6 +970,7 @@
<Content Include="Umbraco_Client\Tinymce3\Plugins\Template\Langs\da_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Template\Langs\de_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Template\Langs\en_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Template\Langs\en_us_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Template\Langs\fi_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Template\Langs\fr_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Template\Langs\he_dlg.js" />
@@ -970,6 +990,8 @@
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracocss\Js\dialog.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracocss\Langs\en.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracocss\Langs\en_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracocss\Langs\en_us.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracocss\Langs\en_us_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracocss\Langs\ru.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracocss\Langs\ru_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracocss\Langs\zh.js" />
@@ -982,6 +1004,8 @@
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracoembed\Js\dialog.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracoembed\Langs\en.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracoembed\Langs\en_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracoembed\Langs\en_us.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracoembed\Langs\en_us_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracoembed\Langs\ru.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracoembed\Langs\ru_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracoembed\Langs\zh.js" />
@@ -989,6 +1013,7 @@
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracoimg\editor_plugin_src.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracoimg\Js\image.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracoimg\Langs\en_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracoimg\Langs\en_us_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracoimg\Langs\he_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracoimg\Langs\ja_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracoimg\Langs\ru_dlg.js" />
@@ -996,6 +1021,7 @@
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracolink\editor_plugin_src.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracolink\Js\umbracolink.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracolink\Langs\en_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracolink\Langs\en_us_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracolink\Langs\he_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracolink\Langs\ja_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracolink\Langs\ru_dlg.js" />
@@ -1006,6 +1032,8 @@
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracomacro\Js\dialog.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracomacro\Langs\en.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracomacro\Langs\en_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracomacro\Langs\en_us.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracomacro\Langs\en_us_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracomacro\Langs\he.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracomacro\Langs\he_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Umbracomacro\Langs\ja.js" />
@@ -1043,6 +1071,7 @@
<Content Include="Umbraco_Client\Tinymce3\Plugins\Xhtmlxtras\Langs\da_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Xhtmlxtras\Langs\de_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Xhtmlxtras\Langs\en_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Xhtmlxtras\Langs\en_us_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Xhtmlxtras\Langs\fi_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Xhtmlxtras\Langs\fr_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Plugins\Xhtmlxtras\Langs\he_dlg.js" />
@@ -1173,6 +1202,8 @@
<Content Include="Umbraco_Client\Tinymce3\Themes\Umbraco\Langs\de_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Themes\Umbraco\Langs\en.js" />
<Content Include="Umbraco_Client\Tinymce3\Themes\Umbraco\Langs\en_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Themes\Umbraco\Langs\en_us.js" />
<Content Include="Umbraco_Client\Tinymce3\Themes\Umbraco\Langs\en_us_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Themes\Umbraco\Langs\es.js" />
<Content Include="Umbraco_Client\Tinymce3\Themes\Umbraco\Langs\es_dlg.js" />
<Content Include="Umbraco_Client\Tinymce3\Themes\Umbraco\Langs\fr.js" />

2
src/Umbraco.Web.UI/config/trees.Release.config
View File

@@ -20,8 +20,6 @@
<add application="settings" alias="nodeTypes" title="Document Types" assembly="umbraco" type="loadNodeTypes" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="6" />
<!--Developer-->
<add application="developer" alias="cacheBrowser" title="Cache Browser" assembly="umbraco" type="loadCache" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="0" />
<add application="developer" alias="CacheItem" title="Cache Item" assembly="umbraco" type="loadCacheItem" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" initialize="false" sortOrder="0" />
<add application="developer" alias="datatype" title="Data Types" assembly="umbraco" type="loadDataTypes" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="1" />
<add application="developer" alias="macros" title="Macros" assembly="umbraco" type="loadMacros" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="2" />
<add application="developer" alias="packager" title="Packages" assembly="umbraco" type="loadPackager" iconClosed="folder.gif" iconOpen="folder_o.gif" sortOrder="3" />

2
src/Umbraco.Web.UI/config/trees.config
View File

@@ -16,8 +16,6 @@
<add application="settings" alias="mediaTypes" title="Media Types" assembly="umbraco" type="loadMediaTypes" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="5" />
<add application="settings" alias="nodeTypes" title="Document Types" assembly="umbraco" type="loadNodeTypes" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="6" />
<!--Developer-->
<add application="developer" alias="cacheBrowser" title="Cache Browser" assembly="umbraco" type="loadCache" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="0" />
<add application="developer" alias="CacheItem" title="Cache Item" assembly="umbraco" type="loadCacheItem" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" initialize="false" sortOrder="0" />
<add application="developer" alias="datatype" title="Data Types" assembly="umbraco" type="loadDataTypes" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="1" />
<add application="developer" alias="macros" title="Macros" assembly="umbraco" type="loadMacros" iconClosed=".sprTreeFolder" iconOpen=".sprTreeFolder_o" sortOrder="2" />
<add application="developer" alias="packager" title="Packages" assembly="umbraco" type="loadPackager" iconClosed="folder.gif" iconOpen="folder_o.gif" sortOrder="3" />

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

@@ -1660,8 +1660,6 @@
<Compile Include="umbraco.presentation\umbraco\Trees\ContentRecycleBin.cs" />
<Compile Include="umbraco.presentation\umbraco\Trees\FileSystemTree.cs" />
<Compile Include="umbraco.presentation\umbraco\Trees\loadPackager.cs" />
<Compile Include="umbraco.presentation\umbraco\Trees\loadCache.cs" />
<Compile Include="umbraco.presentation\umbraco\Trees\loadCacheItem.cs" />
<Compile Include="umbraco.presentation\umbraco\Trees\loadContent.cs" />
<Compile Include="umbraco.presentation\umbraco\Trees\loadcontentItemType.cs" />
<Compile Include="umbraco.presentation\umbraco\Trees\loadDataTypes.cs" />

4
src/Umbraco.Web/umbraco.presentation/install/steps/theend.ascx.cs
View File

@@ -33,6 +33,10 @@ namespace umbraco.presentation.install.steps
//errorLiteral.Text = ex.ToString();
}
// Update ClientDependency version
var clientDependencyConfig = new ClientDependencyConfiguration();
var clientDependencyUpdated = clientDependencyConfig.IncreaseVersionNumber();
if (!cms.businesslogic.skinning.Skinning.IsStarterKitInstalled())
customizeSite.Visible = false;

90
src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadCache.cs
View File

@@ -1,90 +0,0 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Text;
using System.Web;
using System.Xml;
using System.Configuration;
using umbraco.BasePages;
using umbraco.BusinessLogic;
using umbraco.businesslogic;
using umbraco.cms.businesslogic;
using umbraco.cms.businesslogic.cache;
using umbraco.cms.businesslogic.contentitem;
using umbraco.cms.businesslogic.datatype;
using umbraco.cms.businesslogic.language;
using umbraco.cms.businesslogic.media;
using umbraco.cms.businesslogic.member;
using umbraco.cms.businesslogic.property;
using umbraco.cms.businesslogic.web;
using umbraco.interfaces;
using umbraco.DataLayer;
using umbraco.BusinessLogic.Utils;
using umbraco.cms.presentation.Trees;
using umbraco.BusinessLogic.Actions;
namespace umbraco
{
/// <summary>
/// Handles loading of the cache application into the developer application tree
/// </summary>
[Tree("developer", "cacheBrowser", "Cache Browser")]
public class loadCache : BaseTree
{
public loadCache(string application) : base(application) { }
protected override void CreateRootNode(ref XmlTreeNode rootNode)
{
rootNode.NodeType = "init" + TreeAlias;
rootNode.NodeID = "init";
}
protected override void CreateRootNodeActions(ref List<IAction> actions)
{
actions.Clear();
actions.Add(ActionRefresh.Instance);
}
protected override void CreateAllowedActions(ref List<IAction> actions)
{
actions.Clear();
actions.Add(ActionRefresh.Instance);
}
public override void RenderJS(ref StringBuilder Javascript) { }
public override void Render(ref XmlTree tree)
{
Hashtable ht = Cache.ReturnCacheItemsOrdred();
foreach (string key in ht.Keys)
{
//each child will need to load a CacheItem instead of a Cache tree so
//we'll create a loadCacheItem object in order to get it's serivce url and alias properties
loadCacheItem loadCacheItemTree = new loadCacheItem(this.app);
int itemCount = ((ArrayList)ht[key]).Count;
XmlTreeNode xNode = XmlTreeNode.Create(loadCacheItemTree);
xNode.NodeID = key;
xNode.Text = key + " (" + itemCount + ")";
xNode.Action = string.Empty;
xNode.Source = loadCacheItemTree.GetTreeServiceUrl(key);
xNode.Icon = "developerCacheTypes.gif";
xNode.OpenIcon = "developerCacheTypes.gif";
xNode.HasChildren = itemCount > 0;
OnBeforeNodeRender(ref tree, ref xNode, EventArgs.Empty);
if (xNode != null)
{
tree.Add(xNode);
OnAfterNodeRender(ref tree, ref xNode, EventArgs.Empty);
}
}
}
}
}

98
src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadCacheItem.cs
View File

@@ -1,98 +0,0 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Data;
using System.IO;
using System.Text;
using System.Web;
using System.Xml;
using System.Configuration;
using umbraco.BasePages;
using umbraco.BusinessLogic;
using umbraco.businesslogic;
using umbraco.cms.businesslogic;
using umbraco.cms.businesslogic.cache;
using umbraco.cms.businesslogic.contentitem;
using umbraco.cms.businesslogic.datatype;
using umbraco.cms.businesslogic.language;
using umbraco.cms.businesslogic.media;
using umbraco.cms.businesslogic.member;
using umbraco.cms.businesslogic.property;
using umbraco.cms.businesslogic.web;
using umbraco.interfaces;
using umbraco.DataLayer;
using umbraco.BusinessLogic.Utils;
using umbraco.cms.presentation.Trees;
using umbraco.BusinessLogic.Actions;
namespace umbraco
{
/// <summary>
/// Handles loading of each individual cache items into the application tree under the cache application
/// </summary>
[Tree("developer", "CacheItem", "Cache Item", initialize: false)]
public class loadCacheItem : BaseTree
{
public loadCacheItem(string application) : base(application) { }
protected override void CreateRootNode(ref XmlTreeNode rootNode)
{
rootNode.NodeType = "init" + TreeAlias;
rootNode.NodeID = "init";
}
protected override void CreateRootNodeActions(ref List<IAction> actions)
{
actions.Clear();
actions.Add(ActionRefresh.Instance);
}
protected override void CreateAllowedActions(ref List<IAction> actions)
{
actions.Clear();
actions.Add(ActionRefresh.Instance);
}
/// <summary>
/// Renders the javascript.
/// </summary>
/// <param name="Javascript">The javascript.</param>
public override void RenderJS(ref StringBuilder Javascript)
{
Javascript.Append(
@"
function openCacheItem(id) {
UmbClientMgr.contentFrame('developer/cache/viewCacheItem.aspx?key=' + id);
}
");
}
public override void Render(ref XmlTree tree)
{
Hashtable ht = Cache.ReturnCacheItemsOrdred();
ArrayList a = (ArrayList)ht[this.NodeKey];
for (int i = 0; i < a.Count; i++)
{
XmlTreeNode xNode = XmlTreeNode.Create(this);
xNode.NodeID = a[i].ToString();
xNode.Text = a[i].ToString();
xNode.Action = "javascript:openCacheItem('" + a[i] + "');";
xNode.Icon = "developerCacheItem.gif";
xNode.OpenIcon = "developerCacheItem.gif";
OnBeforeNodeRender(ref tree, ref xNode, EventArgs.Empty);
if (xNode != null)
{
tree.Add(xNode);
OnAfterNodeRender(ref tree, ref xNode, EventArgs.Empty);
}
}
}
}
}

2
src/umbraco.cms/businesslogic/Dictionary.cs
View File

@@ -359,7 +359,7 @@ namespace umbraco.cms.businesslogic
Item.removeText(UniqueId);
// remove key from database
SqlHelper.ExecuteNonQuery("delete from cmsDictionary where [key] ='" + key + "'");
SqlHelper.ExecuteNonQuery("delete from cmsDictionary where [key] = @key", SqlHelper.CreateParameter("@key", key));
// Remove key from cache
DictionaryItems.Remove(key);

8
src/umbraco.cms/businesslogic/web/Document.cs
View File

@@ -778,11 +778,15 @@ namespace umbraco.cms.businesslogic.web
{
get
{
// get all nodes in the path to the document, and get all matching published documents
// the difference should be zero if everything is published
// test nodeObjectType to make sure we only count _content_ nodes
int x = SqlHelper.ExecuteScalar<int>(@"select count(node.id) - count(doc.nodeid)
from umbracoNode as node
left join cmsDocument as doc on (node.id=doc.nodeId and doc.published=1)
where '" + Path + ",' like " + SqlHelper.Concat("node.path", "',%'"));
return (x == 1);
where '" + Path + ",' like " + SqlHelper.Concat("node.path", "',%'") + @"
and node.nodeObjectType='C66BA18E-EAF3-4CFF-8A22-41B16D66A972'");
return (x == 0);
}
}