Fix EZP-21695: Cached ESI can not be shared among pages

ezsystems · Oct 9, 2013 · 8ffca1d · 8ffca1d
1 parent 6a2fe08
commit 8ffca1d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/eZ/Bundle/EzPublishCoreBundle/Fragment/FragmentUriGenerator.php b/eZ/Bundle/EzPublishCoreBundle/Fragment/FragmentUriGenerator.php
@@ -29,11 +29,5 @@ public function generateFragmentUri( ControllerReference $reference, Request $re
         // @see eZ\Publish\Core\MVC\Symfony\EventListener\SiteAccessMatchListener
         if ( $request->attributes->has( 'siteaccess' ) )
             $reference->attributes['serialized_siteaccess'] = serialize( $request->attributes->get( 'siteaccess' ) );
-
-        if ( $request->attributes->has( 'semanticPathinfo' ) )
-            $reference->attributes['semanticPathinfo'] = $request->attributes->get( 'semanticPathinfo' );
-
-        if ( $request->attributes->has( 'viewParametersString' ) )
-            $reference->attributes['viewParametersString'] = $request->attributes->get( 'viewParametersString' );
     }
 }
diff --git a/eZ/Bundle/EzPublishCoreBundle/Fragment/InlineFragmentRenderer.php b/eZ/Bundle/EzPublishCoreBundle/Fragment/InlineFragmentRenderer.php
@@ -27,7 +27,13 @@ protected function generateFragmentUri( ControllerReference $reference, Request
             $this->fragmentUriGenerator = new FragmentUriGenerator;
         }
 
+        // Generate base fragment URI and add other needed attributes
         $this->fragmentUriGenerator->generateFragmentUri( $reference, $request, $absolute );
+        if ( $request->attributes->has( 'semanticPathinfo' ) )
+            $reference->attributes['semanticPathinfo'] = $request->attributes->get( 'semanticPathinfo' );
+        if ( $request->attributes->has( 'viewParametersString' ) )
+            $reference->attributes['viewParametersString'] = $request->attributes->get( 'viewParametersString' );
+
         return parent::generateFragmentUri( $reference, $request, $absolute );
     }
 }