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

WORK IN PROGRESS, GET THE STABLE SOURCE FroM THE DOWNLOADS TAB

Browse Source 
Fixes 2 issues with virtual paths in TinyMCE and the upload control

[TFS Changeset #63981]
This commit is contained in:
PerPloug
2010-02-15 11:45:44 +00:00
parent 5783e82ec7
commit 5cebc5989f
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/editorControls/tinyMCE3/TinyMCE.cs
View File

@@ -152,7 +152,7 @@ namespace umbraco.editorControls.tinyMCE3 {
StyleSheet s = new StyleSheet(int.Parse(styleSheetId));
if (s.nodeObjectType == StyleSheet.ModuleObjectType)
{
cssFiles += SystemDirectories.Css + "/" + s.Text + ".css";
cssFiles += IOHelper.ResolveUrl(SystemDirectories.Css + "/" + s.Text + ".css");
foreach (StylesheetProperty p in s.Properties)
{

7
components/editorControls/uploadfield/uploadField.cs
View File

@@ -372,7 +372,7 @@ namespace umbraco.editorControls
bool hasThumb = false;
try
{
hasThumb = File.Exists( IOHelper.MapPath(fileNameThumb));
hasThumb = File.Exists(IOHelper.FindFile(fileNameThumb));
}
catch { }
if (hasThumb)
@@ -381,12 +381,13 @@ namespace umbraco.editorControls
thumb.ImageUrl = fileNameThumb;
thumb.BorderStyle = BorderStyle.None;
output.WriteLine("<a href=\"" + IOHelper.ResolveUrl( _text ) + "\" target=\"_blank\">");
output.WriteLine("<a href=\"" + IOHelper.FindFile(_text) + "\" target=\"_blank\">");
thumb.RenderControl(output);
output.WriteLine("</a><br/>");
}
else
output.WriteLine("<a href=\"" + IOHelper.ResolveUrl(this.Text) + "\" target=\"_blank\">" + IOHelper.ResolveUrl(this.Text) + "</a><br/>");
output.WriteLine("<a href=\"" + IOHelper.FindFile(this.Text) + "\" target=\"_blank\">" + IOHelper.FindFile(this.Text) + "</a><br/>");
output.WriteLine("<input type=\"checkbox\" id=\"" + this.ClientID + "clear\" name=\"" + this.ClientID + "clear\" value=\"1\"/> <label for=\"" + this.ClientID + "clear\">" + ui.Text("uploadClear") + "</label><br/>");
}
base.Render(output);