yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/7.0.4' into 7.1.0

Browse Source 
Conflicts:
	build/Build.bat
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
	src/umbraco.providers/UsersMembershipProvider.cs
This commit is contained in:
Shannon
2014-02-18 11:11:57 +11:00
parent ab4c58b3a3 13f76f7922
commit 20c2574f94
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Web/umbraco.presentation/umbraco/controls/passwordChanger.ascx.cs
View File

@@ -38,9 +38,12 @@ namespace umbraco.controls
var umbProvider = Provider as MembershipProviderBase;
if (umbProvider != null && umbProvider.AllowManuallyChangingPassword)
{
return false;
_showOldPassword = false;
}
else
{
_showOldPassword = Provider.EnablePasswordRetrieval == false;
}
_showOldPassword = Provider.EnablePasswordRetrieval == false;
}
return _showOldPassword.Value;
}