From f8628a1c50fb72f831f90cac11a355765fb230af Mon Sep 17 00:00:00 2001
From: Georg Ringer <georg.ringer@gmail.com>
Date: Thu, 10 Dec 2020 08:37:53 +0100
Subject: [PATCH] [BUGFIX] Revert method signature change

With #92682 the method `renderForeignRecordHeader` has been changed
which is bad for extensions which xclasses this method.
Put the new parameter into the data array to minimize the impact of the
accessibility change.

Related: #92682
Resolves: #93044
Releases: 10.4
Change-Id: I706bd62d539b9ba69c395e58c511f9f6cbe3e35f
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/67079
Tested-by: TYPO3com <noreply@typo3.com>
Tested-by: Oliver Bartsch <bo@cedev.de>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Oliver Bartsch <bo@cedev.de>
Reviewed-by: Benni Mack <benni@typo3.org>
---
 .../Classes/Form/Container/InlineRecordContainer.php     | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/typo3/sysext/backend/Classes/Form/Container/InlineRecordContainer.php b/typo3/sysext/backend/Classes/Form/Container/InlineRecordContainer.php
index d795222cec21..9adaef932074 100644
--- a/typo3/sysext/backend/Classes/Form/Container/InlineRecordContainer.php
+++ b/typo3/sysext/backend/Classes/Form/Container/InlineRecordContainer.php
@@ -217,7 +217,7 @@ public function render()
 
             $ariaExpanded = $data['isInlineChildExpanded'] ? 'true' : 'false';
             $ariaControls = htmlspecialchars($objectId . '_fields', ENT_QUOTES | ENT_HTML5);
-            $ariaAttributesString = 'aria-expanded="' . $ariaExpanded . '" aria-controls="' . $ariaControls . '"';
+            $data['ariaAttributesString'] = 'aria-expanded="' . $ariaExpanded . '" aria-controls="' . $ariaControls . '"';
             $html = '
 				<div ' . GeneralUtility::implodeAttributes($containerAttributes, true) . '>
 					<div class="panel-heading" data-toggle="formengine-inline" id="' . htmlspecialchars($hashedObjectId, ENT_QUOTES | ENT_HTML5) . '_header" data-expandSingle="' . ($inlineConfig['appearance']['expandSingle'] ? 1 : 0) . '">
@@ -225,7 +225,7 @@ public function render()
 							<div class="form-irre-header-cell form-irre-header-icon">
 								<span class="caret"></span>
 							</div>
-							' . $this->renderForeignRecordHeader($data, $ariaAttributesString) . '
+							' . $this->renderForeignRecordHeader($data) . '
 						</div>
 					</div>
 					<div class="panel-collapse" id="' . $ariaControls . '">' . $html . $hiddenFieldHtml . $combinationHtml . '</div>
@@ -328,10 +328,9 @@ protected function renderCombinationChild(array $data, $appendFormFieldNames)
      * Later on the command-icons are inserted here.
      *
      * @param array $data Current data
-     * @param string $ariaAttributesString HTML aria attributes for the collapse button
      * @return string The HTML code of the header
      */
-    protected function renderForeignRecordHeader(array $data, string $ariaAttributesString)
+    protected function renderForeignRecordHeader(array $data)
     {
         $languageService = $this->getLanguageService();
         $inlineConfig = $data['inlineParentConfig'];
@@ -405,7 +404,7 @@ protected function renderForeignRecordHeader(array $data, string $ariaAttributes
         } else {
             $mediaContainer = '<div class="form-irre-header-icon" id="' . $objectId . '_iconcontainer">' . $iconImg . '</div>';
         }
-        $header = '<button class="form-irre-header-cell form-irre-header-button" ' . $ariaAttributesString . '>' .
+        $header = '<button class="form-irre-header-cell form-irre-header-button" ' . $data['ariaAttributesString'] . '>' .
             $mediaContainer .
             '<div class="form-irre-header-body">' . $label . '</div>' .
             '</button>' .