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

* Fixed an umbraco bug where the macro editor, if it tried to enumerate over a

Browse Source 
property whose value was null, would throw a null reference exception instead
 of just ignoring the property.
This commit is contained in:
ksykora@ksykora-Win7
2012-11-21 07:53:29 -01:00
parent c446be734c
commit a8bf881ae1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web/umbraco.presentation/macro.cs
View File

@@ -1496,7 +1496,7 @@ namespace umbraco
IDictionaryEnumerator ide = attributes.GetEnumerator();
while (ide.MoveNext())
{
div += string.Format("umb_{0}=\"{1}\" ", ide.Key, encodeMacroAttribute(ide.Value.ToString()));
div += string.Format("umb_{0}=\"{1}\" ", ide.Key, encodeMacroAttribute((ide.Value ?? string.Empty).ToString()));
}
div += "ismacro=\"true\" onresizestart=\"return false;\" umbVersionId=\"" + versionId +
@@ -1559,7 +1559,7 @@ namespace umbraco
string querystring = "umbPageId=" + PageID + "&umbVersionId=" + PageVersion;
IDictionaryEnumerator ide = attributes.GetEnumerator();
while (ide.MoveNext())
querystring += "&umb_" + ide.Key + "=" + HttpContext.Current.Server.UrlEncode(ide.Value.ToString());
querystring += "&umb_" + ide.Key + "=" + HttpContext.Current.Server.UrlEncode((ide.Value ?? string.Empty).ToString()));
// Create a new 'HttpWebRequest' Object to the mentioned URL.
string retVal = string.Empty;