Merge pull request ezsystems#44 from natanael89/EZP-29144_website_too…

…lbar_cache_fix Fix EZP-29144: Website Toolbar cache doesn't work properly when Owner ( Self ) Policy Limitation is used
ezpublishlegacy · Aug 3, 2018 · 8ef953c · 8ef953c
2 parents 0093b2c + af45125
commit 8ef953c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/packages/ezdemo_extension/ezextension/ezdemo/autoloads/ezpagedata.php b/packages/ezdemo_extension/ezextension/ezdemo/autoloads/ezpagedata.php
@@ -292,6 +292,14 @@ function modify( $tpl, $operatorName, $operatorParameters, $rootNamespace, $curr
                     $pageData['website_toolbar'] = ( $currentNodeId && $currentUser->attribute('is_logged_in') );
                 }
 
+                // Get owner_id for easier access in templates
+                $pageData['owner_id'] = 0;
+                if ( !empty($currentNodeId) )
+                {
+                    $node = eZContentObjectTreeNode::fetch( $currentNodeId );
+                    $pageData['owner_id'] = $node->attribute('object')->attribute('owner_id');
+                }
+
                 // Init default menu settings
                 $pageData['top_menu']     = $menuIni->variable('SelectedMenu', 'TopMenu');
                 $pageData['left_menu']    = $menuIni->variable('SelectedMenu', 'LeftMenu');

diff --git a/packages/ezdemo_extension/ezextension/ezdemo/design/ezdemo/templates/mobile_pagelayout.tpl b/packages/ezdemo_extension/ezextension/ezdemo/design/ezdemo/templates/mobile_pagelayout.tpl
@@ -38,7 +38,7 @@
     {/foreach}
     {/if}
 
-    {cache-block keys=array( $module_result.uri, $user_hash, $extra_cache_key )}
+    {cache-block keys=array( $module_result.uri, $user_hash, $extra_cache_key, $current_user.contentobject_id|eq( $pagedata.owner_id ) )}
 
     <!-- Toolbar area: START -->
     {if and( $pagedata.website_toolbar, $pagedata.is_edit|not)}

diff --git a/packages/ezdemo_extension/ezextension/ezdemo/design/ezdemo/templates/pagelayout.tpl b/packages/ezdemo_extension/ezextension/ezdemo/design/ezdemo/templates/pagelayout.tpl
@@ -44,7 +44,7 @@
     {include uri='design:page_header.tpl'}
     <!-- Header area: END -->
 
-    {cache-block keys=array( $module_result.uri, $user_hash, $extra_cache_key )}
+    {cache-block keys=array( $module_result.uri, $user_hash, $extra_cache_key, $current_user.contentobject_id|eq( $pagedata.owner_id ) )}
 
     <div class="navbar main-navi">
         <!-- Top menu area: START -->