From 4529c06a2f1f6dfb8402ea1345dfa78256d68ef0 Mon Sep 17 00:00:00 2001 From: Dario Solera Date: Fri, 22 Apr 2011 18:04:14 +0200 Subject: [PATCH] [completed: 588] Fixed (or rather worked-around) bug in directory path manipulation. --- AssemblyVersion.cs | 4 ++-- WebApplication/FileManager.ascx.cs | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/AssemblyVersion.cs b/AssemblyVersion.cs index aa76643..6d847fb 100644 --- a/AssemblyVersion.cs +++ b/AssemblyVersion.cs @@ -16,5 +16,5 @@ using System.Reflection; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("3.0.4.567")] -[assembly: AssemblyFileVersion("3.0.4.567")] \ No newline at end of file +[assembly: AssemblyVersion("3.0.4.568")] +[assembly: AssemblyFileVersion("3.0.4.568")] \ No newline at end of file diff --git a/WebApplication/FileManager.ascx.cs b/WebApplication/FileManager.ascx.cs index 5281483..160f51f 100644 --- a/WebApplication/FileManager.ascx.cs +++ b/WebApplication/FileManager.ascx.cs @@ -286,6 +286,7 @@ namespace ScrewTurn.Wiki { if(!directory.StartsWith("/")) directory = "/" + directory; if(!directory.EndsWith("/")) directory += "/"; + directory = directory.Replace("//", "/"); LoadProviders(); @@ -370,10 +371,10 @@ namespace ScrewTurn.Wiki { /// private string CurrentDirectory { get { - if(ViewState["CurrDir"] != null) return (string)ViewState["CurrDir"]; + if(ViewState["CurrDir"] != null) return ((string)ViewState["CurrDir"]).Replace("//", "/"); else return "/"; } - set { ViewState["CurrDir"] = value; } + set { ViewState["CurrDir"] = value.Replace("//", "/"); } } protected void lnkRoot_Click(object sender, EventArgs e) {