EZP-27101: Recursion protection for retrieving metadata doesn't work properly

kernel/classes/datatypes/ezobjectrelation/ezobjectrelationtype.php

@@ -639,7 +639,7 @@ function metaData( $contentObjectAttribute )
         $object = $this->objectAttributeContent( $contentObjectAttribute );
         if ( $object )
         {
-            if ( eZContentObject::recursionProtect( $object->attribute( 'id' ) ) )
+            if ( eZContentObject::stackRecursionProtect( $contentObjectAttribute->attribute( 'id' ), $object->attribute( 'id' ) ) )
             {
                 // Does the related object exist in the same language as the current content attribute ?
                 if ( in_array( $contentObjectAttribute->attribute( 'language_code' ), $object->attribute( 'current' )->translationList( false, false ) ) )
@@ -651,7 +651,11 @@ function metaData( $contentObjectAttribute )
                     $attributes = $object->contentObjectAttributes();
                 }
 
-                return eZContentObjectAttribute::metaDataArray( $attributes );
+                eZContentObject::stackRecursionProtectionPush();
+                $metaDataArray = eZContentObjectAttribute::metaDataArray( $attributes );
+                eZContentObject::stackRecursionProtectionPop();
+
+                return $metaDataArray;
             }
             else
             {

kernel/classes/datatypes/ezobjectrelationlist/ezobjectrelationlisttype.php

@@ -1616,7 +1616,7 @@ function metaData( $contentObjectAttribute )
                     $subObjectVersionNum = $subCurrentVersionObject->attribute( 'version' );
                 }
 
-                if ( eZContentObject::recursionProtect( $subObjectID ) )
+                if ( eZContentObject::stackRecursionProtect( $contentObjectAttribute->attribute( 'id' ), $subObjectID ) )
                 {
                     if ( !$subObject )
                     {
@@ -1626,7 +1626,10 @@ function metaData( $contentObjectAttribute )
                 }
             }
 
+            eZContentObject::stackRecursionProtectionPush();
             $attributeMetaDataArray = eZContentObjectAttribute::metaDataArray( $attributes );
+            eZContentObject::stackRecursionProtectionPop();
+
             $metaDataArray = array_merge( $metaDataArray, $attributeMetaDataArray );
         }
 

kernel/classes/ezcontentobject.php

@@ -2644,6 +2644,57 @@ static function recursionProtectionEnd()
         unset( $GLOBALS["ez_content_object_recursion_protect"] );
     }
 
+    private static $recursionProtectionStack;
+    private static $recursionProtectionCurrent;
+
+    public static function stackRecursionProtectionStart()
+    {
+        self::$recursionProtectionStack = [];
+        self::$recursionProtectionCurrent = [];
+    }
+
+    public static function stackRecursionProtect($key, $value)
+    {
+        if (self::stackRecursionExistsOnStack($key, $value))
+        {
+            return false;
+        }
+
+        self::$recursionProtectionCurrent[$key][] = $value;
+
+        return true;
+    }
+
+    private static function stackRecursionExistsOnStack($key, $value)
+    {
+        foreach (self::$recursionProtectionStack as $stackItem)
+        {
+            if (array_key_exists($key, $stackItem) && in_array($value, $stackItem[$key], true))
+            {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public static function stackRecursionProtectionPush()
+    {
+        self::$recursionProtectionStack[] = self::$recursionProtectionCurrent;
+        self::$recursionProtectionCurrent = [];
+    }
+
+    public static function stackRecursionProtectionPop()
+    {
+        self::$recursionProtectionCurrent = array_pop(self::$recursionProtectionStack);
+    }
+
+    public static function stackRecursionProtectionEnd()
+    {
+        self::$recursionProtectionStack = null;
+        self::$recursionProtectionCurrent = null;
+    }
+
     /**
      * Transaction unsafe. If you call several transaction unsafe methods you must enclose
      * the calls within a db transaction; thus within db->begin and db->commit.

kernel/search/plugins/ezsearchengine/ezsearchengine.php

@@ -68,7 +68,7 @@ public function addObject( $contentObject, $commit = true )
         $placement = 0;
         $previousWord = '';
 
-        eZContentObject::recursionProtectionStart();
+        eZContentObject::stackRecursionProtectionStart();
         foreach ( $currentVersion->contentObjectAttributes() as $attribute )
         {
             $metaData = array();
@@ -136,7 +136,7 @@ public function addObject( $contentObject, $commit = true )
                 }
             }
         }
-        eZContentObject::recursionProtectionEnd();
+        eZContentObject::stackRecursionProtectionEnd();
 
         $wordIDArray = $this->buildWordIDArray( array_keys( $indexArrayOnlyWords ) );