zydronium/screwturn-4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed and closed #397: HTML head is now properly rendered in all namespaces.

Browse source
This commit is contained in:
Dario Solera 2009-10-22 13:36:27 +00:00
parent bc59865a69
commit cb567df541
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
AssemblyVersion.cs
View file

@ -16,5 +16,5 @@ using System.Reflection;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("3.0.1.413")] [assembly: AssemblyVersion("3.0.1.414")]
[assembly: AssemblyFileVersion("3.0.1.413")] [assembly: AssemblyFileVersion("3.0.1.414")]

2
Core/Tools.cs
View file

@ -83,7 +83,7 @@ namespace ScrewTurn.Wiki {
result.Append(GetJavaScriptIncludes()); result.Append(GetJavaScriptIncludes());
// Include HTML Head // Include HTML Head
result.Append(Settings.Provider.GetMetaDataItem(MetaDataItem.HtmlHead, null)); result.Append(Settings.Provider.GetMetaDataItem(MetaDataItem.HtmlHead, nspace));
return result.ToString(); return result.ToString();
} }

2
WebApplication/MasterPage.master.cs
View file

@ -43,7 +43,7 @@ namespace ScrewTurn.Wiki {
/// <param name="name">The item name.</param> /// <param name="name">The item name.</param>
/// <returns>The namespace-qualified item name.</returns> /// <returns>The namespace-qualified item name.</returns>
private string GetPseudoCacheItemName(string name) { private string GetPseudoCacheItemName(string name) {
if(currentNamespace == null) return name; if(string.IsNullOrEmpty(currentNamespace)) return name;
else return currentNamespace + "." + name; else return currentNamespace + "." + name;
} }

2
WebApplication/MasterPageSA.Master.cs
View file

@ -54,7 +54,7 @@ namespace ScrewTurn.Wiki {
/// <param name="name">The item name.</param> /// <param name="name">The item name.</param>
/// <returns>The namespace-qualified item name.</returns> /// <returns>The namespace-qualified item name.</returns>
private string GetPseudoCacheItemName(string name) { private string GetPseudoCacheItemName(string name) {
if(currentNamespace == null) return name; if(string.IsNullOrEmpty(currentNamespace)) return name;
else return currentNamespace + "." + name; else return currentNamespace + "." + name;
} }