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

Merge with 6.0.4

Browse Source
This commit is contained in:
Shannon Deminick
2013-04-12 00:32:19 +06:00
parent e747438a4b 97355bde6f
commit 0d79eaf3c5
3 changed files with 57 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/umbraco.editorControls/tinyMCE3/webcontrol/TinyMCEWebControl.cs
View File

@@ -338,15 +338,30 @@ namespace umbraco.editorControls.tinyMCE3.webcontrol
var heightProperty = imageMedia.Properties.FirstOrDefault(x => x.Alias == "umbracoHeight");
var umbracoFileProperty = imageMedia.Properties.FirstOrDefault(x => x.Alias == "umbracoFile");
// Format the tag
if (widthProperty != null && heightProperty != null && umbracoFileProperty != null)
var widthValue = string.Empty;
try
{
tempTag = string.Format("{0} rel=\"{1},{2}\" src=\"{3}\" />",
tempTag,
widthProperty.Value,
heightProperty.Value,
umbracoFileProperty.Value);
widthValue = widthProperty.Value.ToString();
}
catch (Exception wx)
{
// For some reason widthProperty == null returns false when the widthproperty is actually null...
}
var heightValue = string.Empty;
try
{
heightValue = heightProperty.Value.ToString();
}
catch (Exception ex)
{
// For some reason heightProperty == null returns false when the heightProperty is actually null...
}
// Format the tag
if (umbracoFileProperty != null)
tempTag = string.Format("{0} rel=\"{1},{2}\" src=\"{3}\" />", tempTag, widthValue, heightValue, umbracoFileProperty.Value);
}
html = html.Replace(tag.Value, tempTag);