Fix EZP-24154: Overriding on section identifier does not work

ezpublishlegacy · Mar 23, 2015 · 8077ef9 · 8077ef9
1 parent c66558d
commit 8077ef9
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/kernel/classes/eznodeviewfunctions.php b/kernel/classes/eznodeviewfunctions.php
@@ -236,6 +236,7 @@ static function generateNodeViewData( eZTemplate $tpl, eZContentObjectTreeNode $
         $contentInfoArray['class_group']             = $object->attribute( 'match_ingroup_id_list' );
         $contentInfoArray['state']                   = $object->attribute( 'state_id_array' );
         $contentInfoArray['state_identifier']        = $object->attribute( 'state_identifier_array' );
+        $contentInfoArray['section_identifier']      = $sectionIdentifier;
         $contentInfoArray['parent_class_id']         = $parentClassID;
         $contentInfoArray['parent_class_identifier'] = $parentClassIdentifier;
         $contentInfoArray['parent_node_remote_id']   = $parentNodeRemoteID;
@@ -516,6 +517,10 @@ static public function contentViewRetrieve( $file, $mtime, $args )
                 if ( isset( $Result['content_info']['class_identifier'] ) )
                     $keyArray[] = array( 'class_identifier', $Result['content_info']['class_identifier'] );
 
+                // Added in 5.3.5 / 5.4.2, so test that cache contains this before using
+                if ( isset( $Result['content_info']['section_identifier'] ) )
+                    $keyArray[] = array( 'section_identifier', $Result['content_info']['section_identifier'] );
+
                 $res = eZTemplateDesignResource::instance();
                 $res->setKeys( $keyArray );