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

Fixed and closed #480: "?Discuss=1" and "?Code=1" links are now correct.

Browse source
This commit is contained in:
Dario Solera 2010-02-02 09:11:00 +00:00
parent ee5b18d0ad
commit a777650e1f
2 changed files with 8 additions and 6 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.466")] [assembly: AssemblyVersion("3.0.1.467")]
[assembly: AssemblyFileVersion("3.0.1.466")] [assembly: AssemblyFileVersion("3.0.1.467")]

10
WebApplication/Default.aspx.cs
View file

@ -122,8 +122,9 @@ namespace ScrewTurn.Wiki {
lblDiscussLink.Visible = !discussMode && !viewCodeMode && canViewDiscussion; lblDiscussLink.Visible = !discussMode && !viewCodeMode && canViewDiscussion;
if(lblDiscussLink.Visible) { if(lblDiscussLink.Visible) {
lblDiscussLink.Text = string.Format(@"<a id=""DiscussLink"" title=""{0}"" href=""?Discuss=1"">{1} ({2})</a>", lblDiscussLink.Text = string.Format(@"<a id=""DiscussLink"" title=""{0}"" href=""{3}?Discuss=1"">{1} ({2})</a>",
Properties.Messages.Discuss, Properties.Messages.Discuss, Pages.GetMessageCount(currentPage)); Properties.Messages.Discuss, Properties.Messages.Discuss, Pages.GetMessageCount(currentPage),
UrlTools.BuildUrl(NameTools.GetLocalName(currentPage.FullName), Settings.PageExtension));
} }
lblEditLink.Visible = Settings.EnablePageToolbar && !discussMode && !viewCodeMode && canEdit; lblEditLink.Visible = Settings.EnablePageToolbar && !discussMode && !viewCodeMode && canEdit;
@ -137,8 +138,9 @@ namespace ScrewTurn.Wiki {
if(Settings.EnablePageToolbar && Settings.EnableViewPageCodeFeature) { if(Settings.EnablePageToolbar && Settings.EnableViewPageCodeFeature) {
lblViewCodeLink.Visible = !discussMode && !viewCodeMode && !canEdit; lblViewCodeLink.Visible = !discussMode && !viewCodeMode && !canEdit;
if(lblViewCodeLink.Visible) { if(lblViewCodeLink.Visible) {
lblViewCodeLink.Text = string.Format(@"<a id=""ViewCodeLink"" title=""{0}"" href=""?Code=1"">{1}</a>", lblViewCodeLink.Text = string.Format(@"<a id=""ViewCodeLink"" title=""{0}"" href=""{2}?Code=1"">{1}</a>",
Properties.Messages.ViewPageCode, Properties.Messages.ViewPageCode); Properties.Messages.ViewPageCode, Properties.Messages.ViewPageCode,
UrlTools.BuildUrl(NameTools.GetLocalName(currentPage.FullName), Settings.PageExtension));
} }
} }
else lblViewCodeLink.Visible = false; else lblViewCodeLink.Visible = false;