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

Merge pull request #353 from eerrecart/fix-U4-4696

Browse Source 
fix for: U4-4696. Macro personalized cache with custom membership provider not working
This commit is contained in:
Shandem
2014-04-24 11:54:54 +10:00
parent ee210ae5d8 1eaf02b221
commit 3bac4877eb
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web/umbraco.presentation/macro.cs
View File

@@ -216,8 +216,8 @@ namespace umbraco
if (CacheByPersonalization)
{
var currentMember = Member.GetCurrentMember();
id.AppendFormat("m{0}-", currentMember == null ? 0 : currentMember.Id);
int currentMember = Member.CurrentMemberId();
id.AppendFormat("m{0}-", currentMember);
}
foreach (var prop in model.Properties)
@@ -525,7 +525,7 @@ namespace umbraco
if (Model.CacheDuration > 0)
{
// do not add to cache if there's no member and it should cache by personalization
if (!Model.CacheByMember || (Model.CacheByMember && Member.GetCurrentMember() != null))
if (!Model.CacheByMember || (Model.CacheByMember && Member.IsLoggedOn()))
{
if (macroControl != null)
{