From 2ce4c56915b14600ad0786d39f3dbbc7f1fb5187 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <nimullen@microsoft.com>
Date: Fri, 2 May 2014 15:21:14 -0700
Subject: [PATCH] Fixed sample to not override User property.

#277
---
 .../Filters/AgeEnhancerFilterAttribute.cs              |  2 +-
 samples/MvcSample.Web/FiltersController.cs             | 10 +++++-----
 samples/MvcSample.Web/HomeController.cs                |  6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/samples/MvcSample.Web/Filters/AgeEnhancerFilterAttribute.cs b/samples/MvcSample.Web/Filters/AgeEnhancerFilterAttribute.cs
index 3a143f3d03..91a620fbcc 100644
--- a/samples/MvcSample.Web/Filters/AgeEnhancerFilterAttribute.cs
+++ b/samples/MvcSample.Web/Filters/AgeEnhancerFilterAttribute.cs
@@ -30,7 +30,7 @@ namespace MvcSample.Web.Filters
 
             if (controller != null)
             {
-                controller.User.Log += "Age Enhanced!" + Environment.NewLine;
+                controller.CustomUser.Log += "Age Enhanced!" + Environment.NewLine;
             }
             
             if (context.ActionArguments.TryGetValue("age", out age))
diff --git a/samples/MvcSample.Web/FiltersController.cs b/samples/MvcSample.Web/FiltersController.cs
index 64609f1100..d824167527 100644
--- a/samples/MvcSample.Web/FiltersController.cs
+++ b/samples/MvcSample.Web/FiltersController.cs
@@ -31,11 +31,11 @@ namespace MvcSample.Web
     [TypeFilter(typeof(UserNameProvider), Order = -1)]
     public class FiltersController : Controller
     {
-        public User User { get; set; }
+        public User CustomUser { get; set; }
 
         public FiltersController()
         {
-            User = new User() { Name = "User Name", Address = "Home Address" };
+            CustomUser = new User() { Name = "User Name", Address = "Home Address" };
         }
 
         // TODO: Add a real filter here
@@ -47,12 +47,12 @@ namespace MvcSample.Web
         {
             if (!string.IsNullOrEmpty(userName))
             {
-                User.Name = userName;
+                CustomUser.Name = userName;
             }
 
-            User.Age = age;
+            CustomUser.Age = age;
 
-            return View("MyView", User);
+            return View("MyView", CustomUser);
         }
 
         public ActionResult Blocked(int age, string userName)
diff --git a/samples/MvcSample.Web/HomeController.cs b/samples/MvcSample.Web/HomeController.cs
index 9407ca7fd1..cffef930c0 100644
--- a/samples/MvcSample.Web/HomeController.cs
+++ b/samples/MvcSample.Web/HomeController.cs
@@ -30,7 +30,7 @@ namespace MvcSample.Web
 
         public ActionResult Index()
         {
-            return View("MyView", User());
+            return View("MyView", CreateUser());
         }
 
         public ActionResult ValidationSummary()
@@ -97,7 +97,7 @@ namespace MvcSample.Web
             Context.Response.WriteAsync("Hello World raw");
         }
 
-        public User User()
+        public User CreateUser()
         {
             User user = new User()
             {
@@ -125,7 +125,7 @@ namespace MvcSample.Web
         /// </summary>
         public ActionResult MyView()
         {
-            return View(User());
+            return View(CreateUser());
         }
 
         private static IEnumerable<SelectListItem> CreateAddresses()