From 6f72d040b3d9f9de53f2585e219f5ddeb27238dc Mon Sep 17 00:00:00 2001
From: Sebastien Ros <sebros@microsoft.com>
Date: Mon, 11 Oct 2010 13:53:07 -0700
Subject: [PATCH] Corrected merge

--HG--
branch : dev
---
 .../Modules/Orchard.Users/Controllers/AdminController.cs      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs
index 451a0326e..32f52b661 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs
@@ -108,7 +108,7 @@ namespace Orchard.Users.Controllers {
             var user = Services.ContentManager.Get<UserPart>(id);
 
             return View(new UserEditViewModel {
-                User = Services.ContentManager.BuildEditorModel(user) 
+                User = Services.ContentManager.BuildEditor(user) 
             });
         }
 
@@ -119,7 +119,7 @@ namespace Orchard.Users.Controllers {
 
             var user = Services.ContentManager.Get(id);
             var model = new UserEditViewModel {
-                User = Services.ContentManager.UpdateEditorModel(user, this)
+                User = Services.ContentManager.UpdateEditor(user, this)
             };
 
             TryUpdateModel(model);