From b41cf37dd5fa92bf217918cbdc91002a4c91784e Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 29 May 2013 03:42:20 -0200
Subject: [PATCH 1/2] U4-2290 Notifications do not handle fields that have null
 values.

---
 src/umbraco.cms/businesslogic/workflow/Notification.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/umbraco.cms/businesslogic/workflow/Notification.cs b/src/umbraco.cms/businesslogic/workflow/Notification.cs
index 7722fd03ba..e755a29b9d 100644
--- a/src/umbraco.cms/businesslogic/workflow/Notification.cs
+++ b/src/umbraco.cms/businesslogic/workflow/Notification.cs
@@ -84,8 +84,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);
@@ -124,7 +124,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(

From b4d88b0361f203bcbb8ad16bbad9d4be600f64a3 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 29 May 2013 03:44:01 -0200
Subject: [PATCH 2/2] U4-2279 TryGetRouteDefinitionFromAncestorViewContexts has
 infinite loop when currentContext doesnt contain umbraco-route-def

---
 src/Umbraco.Web/Mvc/SurfaceController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Mvc/SurfaceController.cs b/src/Umbraco.Web/Mvc/SurfaceController.cs
index 0e0b7b5827..5888ea0bc6 100644
--- a/src/Umbraco.Web/Mvc/SurfaceController.cs
+++ b/src/Umbraco.Web/Mvc/SurfaceController.cs
@@ -114,7 +114,7 @@ namespace Umbraco.Web.Mvc
                 else
                 {
                     //exit the loop
-                    currentRouteData = null;
+                    currentContext = null;
                 }
             }
             return new Attempt<RouteDefinition>(