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

Fixed issue with single quotes in file/attachment names in file manager and attachment manager/viewer.

Browse source
This commit is contained in:
Dario Solera 2009-10-20 12:31:16 +00:00
parent 94abba610b
commit ec1fe8967b
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.405")] [assembly: AssemblyVersion("3.0.1.406")]
[assembly: AssemblyFileVersion("3.0.1.405")] [assembly: AssemblyFileVersion("3.0.1.406")]

2
WebApplication/AttachmentManager.ascx.cs
View file

@ -147,7 +147,7 @@ namespace ScrewTurn.Wiki {
row["Editable"] = canUpload && canDelete && (ext == ".jpg" || ext == ".jpeg" || ext == ".png"); row["Editable"] = canUpload && canDelete && (ext == ".jpg" || ext == ".jpeg" || ext == ".png");
row["Page"] = CurrentPage.FullName; row["Page"] = CurrentPage.FullName;
if(canDownload) { if(canDownload) {
row["Link"] = "GetFile.aspx?File=" + Tools.UrlEncode(s) + "&AsStreamAttachment=1&Provider=" + row["Link"] = "GetFile.aspx?File=" + Tools.UrlEncode(s).Replace("'", "'") + "&AsStreamAttachment=1&Provider=" +
provider.GetType().FullName + "&IsPageAttachment=1&Page=" + provider.GetType().FullName + "&IsPageAttachment=1&Page=" +
Tools.UrlEncode(CurrentPage.FullName) + "&NoHit=1"; Tools.UrlEncode(CurrentPage.FullName) + "&NoHit=1";
} }

2
WebApplication/AttachmentViewer.ascx.cs
View file

@ -49,7 +49,7 @@ namespace ScrewTurn.Wiki {
DataRow row = table.NewRow(); DataRow row = table.NewRow();
row["Name"] = s; row["Name"] = s;
row["Size"] = Tools.BytesToString(provider.GetPageAttachmentDetails(pageInfo, s).Size); row["Size"] = Tools.BytesToString(provider.GetPageAttachmentDetails(pageInfo, s).Size);
row["Link"] = "GetFile.aspx?File=" + Tools.UrlEncode(s) + "&AsStreamAttachment=1&Provider=" + row["Link"] = "GetFile.aspx?File=" + Tools.UrlEncode(s).Replace("'", "'") + "&AsStreamAttachment=1&Provider=" +
provider.GetType().FullName + "&IsPageAttachment=1&Page=" + Tools.UrlEncode(pageInfo.FullName); provider.GetType().FullName + "&IsPageAttachment=1&Page=" + Tools.UrlEncode(pageInfo.FullName);
table.Rows.Add(row); table.Rows.Add(row);
} }

2
WebApplication/FileManager.ascx.cs
View file

@ -195,7 +195,7 @@ namespace ScrewTurn.Wiki {
row["Size"] = Tools.BytesToString(details.Size); row["Size"] = Tools.BytesToString(details.Size);
row["WikiMarkupLink"] = "{UP}" + Tools.UrlEncode(s); row["WikiMarkupLink"] = "{UP}" + Tools.UrlEncode(s);
if(canDownload) { if(canDownload) {
row["Link"] = "GetFile.aspx?File=" + Tools.UrlEncode(s) + "&AsStreamAttachment=1&Provider=" + row["Link"] = "GetFile.aspx?File=" + Tools.UrlEncode(s).Replace("'", "'") + "&AsStreamAttachment=1&Provider=" +
provider.GetType().FullName + "&NoHit=1"; provider.GetType().FullName + "&NoHit=1";
} }
else { else {