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

Richtext null ref exception fixed

Browse Source
This commit is contained in:
perploug
2013-09-23 10:45:12 +02:00
parent 4c77e0de0e
commit bd4ecafc74
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx
View File

@@ -113,7 +113,7 @@
UmbClientMgr.openAngularModalWindow({
template: 'views/common/dialogs/iconpicker.html',
callback: function(data){
jQuery(that).next().val("." + data);
jQuery(that).next().val(data);
jQuery(that).find("i").attr("class", data);
}});

4
src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
View File

@@ -34,8 +34,10 @@ namespace Umbraco.Web.PropertyEditors
/// <returns></returns>
public override object FormatDataForEditor(object dbValue)
{
var parsed = MacroTagParser.FormatRichTextPersistedDataForEditor(dbValue.ToString(), new Dictionary<string, string>());
if (dbValue == null)
return dbValue;
var parsed = MacroTagParser.FormatRichTextPersistedDataForEditor(dbValue.ToString(), new Dictionary<string, string>());
return parsed;
}

1
src/Umbraco.Web/umbraco.presentation/umbraco/controls/ContentTypeControlNew.ascx.cs
View File

@@ -429,7 +429,6 @@ namespace umbraco.controls
txtName.Text = _contentType.GetRawText();
txtAlias.Text = _contentType.Alias;
description.Text = _contentType.GetRawDescription();
tb_icon.Value = _contentType.IconUrl;
if(string.IsNullOrEmpty(_contentType.IconUrl))