DO NOT DOWNLOAD. DOWNLOAD LATEST STABLE FROM RELEASE TAB
Fixed new datatype bug when it defaults to TinyMCE that doesn't handle empty Configuration object [TFS Changeset #55170]
This commit is contained in:
@@ -116,6 +116,8 @@ namespace umbraco.editorControls.tinymce
|
||||
|
||||
if (!Page.IsPostBack)
|
||||
{
|
||||
if (Configuration != null)
|
||||
{
|
||||
string[] config = Configuration.Split("|".ToCharArray());
|
||||
if (config.Length > 0)
|
||||
{
|
||||
@@ -163,7 +165,10 @@ namespace umbraco.editorControls.tinymce
|
||||
while (ide.MoveNext())
|
||||
{
|
||||
tinyMCECommand cmd = (tinyMCECommand) ide.Value;
|
||||
ListItem li = new ListItem(string.Format("<img src=\"{0}\" class=\"tinymceIcon\" alt=\"{1}\" /> ", cmd.Icon, cmd.Alias), cmd.Alias);
|
||||
ListItem li =
|
||||
new ListItem(
|
||||
string.Format("<img src=\"{0}\" class=\"tinymceIcon\" alt=\"{1}\" /> ", cmd.Icon,
|
||||
cmd.Alias), cmd.Alias);
|
||||
if (_selectedButtons.IndexOf(cmd.Alias) > -1)
|
||||
li.Selected = true;
|
||||
|
||||
@@ -189,7 +194,7 @@ namespace umbraco.editorControls.tinymce
|
||||
|
||||
_stylesheetList.Items.Add(li);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// Mark the current db type
|
||||
_dropdownlist.SelectedValue = _datatype.DBType.ToString();
|
||||
|
||||
Reference in New Issue
Block a user