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

Merge with 4.11.9

Browse Source
This commit is contained in:
Sebastiaan Janssen
2013-05-29 03:47:26 -02:00
parent fc32100142 b4d88b0361
commit 4a7ee52d63
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web/Mvc/SurfaceController.cs
View File

@@ -114,7 +114,7 @@ namespace Umbraco.Web.Mvc
else
{
//exit the loop
currentRouteData = null;
currentContext = null;
}
}
return new Attempt<RouteDefinition>(

6
src/umbraco.cms/businesslogic/workflow/Notification.cs
View File

@@ -83,8 +83,8 @@ namespace umbraco.cms.businesslogic.workflow
{
// check if something was changed and display the changes otherwise display the fields
Property oldProperty = oldDoc.getProperty(p.PropertyType.Alias);
string oldText = oldProperty.Value.ToString();
string newText = p.Value.ToString();
string oldText = oldProperty.Value != null ? oldProperty.Value.ToString() : "";
string newText = p.Value != null ? p.Value.ToString() : "";
// replace html with char equivalent
ReplaceHTMLSymbols(ref oldText);
@@ -123,7 +123,7 @@ namespace umbraco.cms.businesslogic.workflow
summary.Append("<tr>");
summary.Append("<th style='text-align: left; vertical-align: top; width: 25%;'>" +
p.PropertyType.Name + "</th>");
summary.Append("<td style='text-align: left; vertical-align: top;'>" + p.Value.ToString() + "</td>");
summary.Append("<td style='text-align: left; vertical-align: top;'>" + newText + "</td>");
summary.Append("</tr>");
}
summary.Append(