From 18cd049690d879c64d16b6f108d2cf3b38493be7 Mon Sep 17 00:00:00 2001
From: Sebastien Ros <sebastien.ros@microsoft.com>
Date: Fri, 16 Aug 2013 11:49:13 -0700
Subject: [PATCH] #19919: Fixing MediaPicker upgrade on missing files

Work Item: 19919
---
 .../Modules/Upgrade/Controllers/MediaController.cs        | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Orchard.Web/Modules/Upgrade/Controllers/MediaController.cs b/src/Orchard.Web/Modules/Upgrade/Controllers/MediaController.cs
index 0a2b3eaf6..23b340504 100644
--- a/src/Orchard.Web/Modules/Upgrade/Controllers/MediaController.cs
+++ b/src/Orchard.Web/Modules/Upgrade/Controllers/MediaController.cs
@@ -186,6 +186,14 @@ namespace Upgrade.Controllers {
                             if (media != null) {
                                 contentField.Url = "{" + media.Id + "}";
                             }
+                            else {
+                                // We don't want "broken" links left behind so instead want them converted to empty fields as broken links cause the page to crash
+                                // Because this might be run "twice", don't override already valid contentField Url's
+                                string contentFieldUrl = contentField.Url;
+                                if (!contentFieldUrl.StartsWith("{")) {
+                                    contentField.Url = "";
+                                }
+                            }
                         }
                     }
                 }