[BUGFIX] Possible warning on getRecordTitle 76/43176/2
authorChristian Kuhn <lolli@schwarzbu.ch>
Thu, 10 Sep 2015 15:55:59 +0000 (17:55 +0200)
committerChristian Kuhn <lolli@schwarzbu.ch>
Thu, 10 Sep 2015 17:32:40 +0000 (19:32 +0200)
Resolves: #69653
Releases: master
Change-Id: I0fd8546ec865770657e8937f7151ff378eaf6d9e
Reviewed-on: http://review.typo3.org/43176
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Markus Klein <markus.klein@typo3.org>
typo3/sysext/backend/Classes/Controller/EditDocumentController.php
typo3/sysext/backend/Classes/Form/Container/OuterWrapContainer.php

index 851c360..d530621 100644 (file)
@@ -997,7 +997,7 @@ class EditDocumentController implements \TYPO3\CMS\Core\Http\ControllerInterface
                                                                if (!$this->storeTitle) {
                                                                        $this->storeTitle = $this->recTitle
                                                                                ? htmlspecialchars($this->recTitle)
-                                                                               : BackendUtility::getRecordTitle($table, $formData['databaseRow'], TRUE);
+                                                                               : BackendUtility::getRecordTitle($table, FormEngineUtility::databaseRowCompatibility($formData['databaseRow']), TRUE);
                                                                }
 
                                                                $this->elementsData[] = array(
index a6950fd..4f3db89 100644 (file)
@@ -14,6 +14,7 @@ namespace TYPO3\CMS\Backend\Form\Container;
  * The TYPO3 project - inspiring people to share!
  */
 
+use TYPO3\CMS\Backend\Form\Utility\FormEngineUtility;
 use TYPO3\CMS\Backend\Template\DocumentTemplate;
 use TYPO3\CMS\Backend\Utility\IconUtility;
 use TYPO3\CMS\Core\Authentication\BackendUserAuthentication;
@@ -97,7 +98,7 @@ class OuterWrapContainer extends AbstractContainer {
 
                        $newOrUid = ' <span class="typo3-TCEforms-recUid">[' . htmlspecialchars($row['uid']) . ']</span>';
 
-                       $recordLabel = BackendUtility::getRecordTitle($table, $row, TRUE, FALSE);
+                       $recordLabel = BackendUtility::getRecordTitle($table, FormEngineUtility::databaseRowCompatibility($row), TRUE, FALSE);
                        if ($table === 'pages') {
                                $label = $languageService->sL('LLL:EXT:lang/locallang_core.xlf:labels.editPage', TRUE);
                                $pageTitle = sprintf($label, $tableTitle, $recordLabel);