From 10eb50c2ec486818352705421d56f835235c0ced Mon Sep 17 00:00:00 2001
From: Sebastien Ros <none@none>
Date: Mon, 10 Jan 2011 15:49:56 -0800
Subject: [PATCH] Fixing validation messages not displayed when using
 ShapeResult

--HG--
branch : 1.x
---
 .../Modules/Orchard.Users/Controllers/AccountController.cs  | 6 +++---
 src/Orchard/Mvc/ShapeResult.cs                              | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs
index 8bbc8a922..7da36e3f0 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AccountController.cs
@@ -45,7 +45,7 @@ namespace Orchard.Users.Controllers {
             if (currentUser == null) {
                 Logger.Information("Access denied to anonymous request on {0}", returnUrl);
                 var shape = _orchardServices.New.LogOn().Title(T("Access Denied").Text);
-                return new ShapeResult(shape); 
+                return new ShapeResult(this, shape); 
             }
 
             //TODO: (erikpo) Add a setting for whether or not to log access denieds since these can fill up a database pretty fast from bots on a high traffic site
@@ -59,7 +59,7 @@ namespace Orchard.Users.Controllers {
                 return Redirect("~/");
 
             var shape = _orchardServices.New.LogOn().Title(T("Log On").Text);
-            return new ShapeResult(shape);
+            return new ShapeResult(this, shape); 
         }
 
         [HttpPost]
@@ -69,7 +69,7 @@ namespace Orchard.Users.Controllers {
             var user = ValidateLogOn(userNameOrEmail, password);
             if (!ModelState.IsValid) {
                 var shape = _orchardServices.New.LogOn().Title(T("Log On").Text);
-                return new ShapeResult(shape);
+                return new ShapeResult(this, shape); 
             }
 
             _authenticationService.SignIn(user, false);
diff --git a/src/Orchard/Mvc/ShapeResult.cs b/src/Orchard/Mvc/ShapeResult.cs
index 797dc44f3..d357c6ba9 100644
--- a/src/Orchard/Mvc/ShapeResult.cs
+++ b/src/Orchard/Mvc/ShapeResult.cs
@@ -2,7 +2,9 @@
 
 namespace Orchard.Mvc {
     public class ShapeResult : ViewResult {
-        public ShapeResult(dynamic shape) {
+        public ShapeResult(ControllerBase controller, dynamic shape) {
+            ViewData = controller.ViewData;
+            TempData = controller.TempData;
             ViewData.Model = shape;
             ViewName = "~/Core/Shapes/Views/ShapeResult/Display.cshtml";
         }