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 
Virtual Directory support, DLR compatible script engine

[TFS Changeset #63625]
This commit is contained in:
PerPloug
2010-01-28 12:51:46 +00:00
parent 795f628125
commit 5f92006bb6
251 changed files with 4770 additions and 1659 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@ using umbraco.editorControls.wysiwyg;
using umbraco.interfaces;
using umbraco.uicontrols;
using umbraco.editorControls.tinymce;
using umbraco.IO;
namespace umbraco.editorControls.tinyMCE3 {
@@ -151,7 +152,7 @@ namespace umbraco.editorControls.tinyMCE3 {
StyleSheet s = new StyleSheet(int.Parse(styleSheetId));
if (s.nodeObjectType == StyleSheet.ModuleObjectType)
{
cssFiles += GlobalSettings.Path + "/../css/" + s.Text + ".css";
cssFiles += SystemDirectories.Css + "/" + s.Text + ".css";
foreach (StylesheetProperty p in s.Properties)
{
@@ -254,7 +255,7 @@ namespace umbraco.editorControls.tinyMCE3 {
}
}
//if (HttpContext.Current.Request.Path.IndexOf(GlobalSettings.Path) > -1)
//if (HttpContext.Current.Request.Path.IndexOf(umbraco.IO.SystemDirectories.Umbraco) > -1)
// config.Add("language", User.GetUser(BasePage.GetUserId(BasePage.umbracoUserContextID)).Language);
//else
// config.Add("language", System.Threading.Thread.CurrentThread.CurrentCulture.TwoLetterISOLanguageName);