Merge commit '85a74e4fa700c83bab4bf3436f69f045029932cd' into 7.1.0

Conflicts: src/Umbraco.Core/Umbraco.Core.csproj src/Umbraco.Web/Controllers/UmbLoginController.cs src/Umbraco.Web/Controllers/UmbLoginStatusController.cs src/Umbraco.Web/Controllers/UmbProfileController.cs src/Umbraco.Web/Controllers/UmbRegisterController.cs
2014-03-13 14:12:02 +11:00
parent 62d4bff8aa 85a74e4fa7
commit b533a9f690
9 changed files with 138 additions and 43 deletions
--- a/src/Umbraco.Web/Controllers/UmbProfileController.cs
+++ b/src/Umbraco.Web/Controllers/UmbProfileController.cs
@@ -41,7 +41,7 @@ namespace Umbraco.Web.Controllers
            }

            //redirect to current page by default
-            TempData.Add("ProfileUpdateSuccess", true);
+            TempData["ProfileUpdateSuccess"] = true;            
            return RedirectToCurrentUmbracoPage();
        }
    }