From 7a3a20889a9258ce809b771348b3d4c0cb804cba Mon Sep 17 00:00:00 2001
From: Sebastien Ros <none@none>
Date: Wed, 11 Jan 2012 16:08:55 -0800
Subject: [PATCH] #18334: Fixing UnsafeUrl behavior

Work Item: 18334

--HG--
branch : 1.x
---
 .../Views/Parts.Contents.Publish.SummaryAdmin.cshtml        | 6 +++---
 src/Orchard.Web/Core/Shapes/Scripts/base.js                 | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Orchard.Web/Core/Contents/Views/Parts.Contents.Publish.SummaryAdmin.cshtml b/src/Orchard.Web/Core/Contents/Views/Parts.Contents.Publish.SummaryAdmin.cshtml
index 03307cbcc..f7352f776 100644
--- a/src/Orchard.Web/Core/Contents/Views/Parts.Contents.Publish.SummaryAdmin.cshtml
+++ b/src/Orchard.Web/Core/Contents/Views/Parts.Contents.Publish.SummaryAdmin.cshtml
@@ -9,14 +9,14 @@
     @T(" | ")
 
     if (contentPart.HasDraft()) {
-        @Html.Link(T("Publish Draft").Text, Url.Action("Publish", "Admin", new { area = "Contents", id = contentPart.ContentItem.Id, returnUrl = Request.ToUrlString() }), new { itemprop = "PublishUrl UnsafeUrl" })
+        @Html.Link(T("Publish Draft").Text, Url.Action("Publish", "Admin", new { area = "Contents", id = contentPart.ContentItem.Id, returnUrl = Request.ToUrlString() }), new { itemprop = "UnsafeUrl" })
         @T(" | ")
 
         @Html.ActionLink(T("Preview").Text, "Preview", "Item", new { area = "Contents", id = ((ContentItem)Model.ContentPart.ContentItem).Id }, new { })
         @T(" | ")
     }
 
-    @Html.Link(T("Unpublish").Text, Url.Action("Unpublish", "Admin", new { area = "Contents", id = contentPart.ContentItem.Id, returnUrl = Request.ToUrlString() }), new { itemprop = "UnpublishUrl UnsafeUrl" })
+    @Html.Link(T("Unpublish").Text, Url.Action("Unpublish", "Admin", new { area = "Contents", id = contentPart.ContentItem.Id, returnUrl = Request.ToUrlString() }), new { itemprop = "UnsafeUrl" })
     @T(" | ")
 } else {
     if ( contentPart.HasDraft() ) {    
@@ -24,6 +24,6 @@
         @T(" | ")
     }
 
-    @Html.Link(T("Publish").Text, Url.Action("Publish", "Admin", new { area = "Contents", id = contentPart.ContentItem.Id, returnUrl = Request.ToUrlString() }), new { itemprop = "PublishUrl UnsafeUrl" })
+    @Html.Link(T("Publish").Text, Url.Action("Publish", "Admin", new { area = "Contents", id = contentPart.ContentItem.Id, returnUrl = Request.ToUrlString() }), new { itemprop = "UnsafeUrl" })
     @T(" | ")
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Shapes/Scripts/base.js b/src/Orchard.Web/Core/Shapes/Scripts/base.js
index d94688056..bf23bf26b 100644
--- a/src/Orchard.Web/Core/Shapes/Scripts/base.js
+++ b/src/Orchard.Web/Core/Shapes/Scripts/base.js
@@ -214,7 +214,9 @@
                         return false;
                     }
                 }
-                form.submit(); 
+                
+                form.submit();
+                return false;
             });
         });
     });