diff --git a/typo3/sysext/install/Classes/Updates/RteFileLinksUpdateWizard.php b/typo3/sysext/install/Classes/Updates/RteFileLinksUpdateWizard.php index f543c8522702693c20f0483b77e2f30a38c6181b..c8adfc4f2ea5753374f3205241590b0c5a7a12d1 100644 --- a/typo3/sysext/install/Classes/Updates/RteFileLinksUpdateWizard.php +++ b/typo3/sysext/install/Classes/Updates/RteFileLinksUpdateWizard.php @@ -149,24 +149,15 @@ class RteFileLinksUpdateWizard extends AbstractUpdate { $dbQueries = $this->queries; if (count($this->errors) > 0) { - foreach ($this->errors as $errorMessage) { - $message = GeneralUtility::makeInstance( - 'TYPO3\\CMS\\Core\\Messaging\\FlashMessage', - $errorMessage, - '', - \TYPO3\CMS\Core\Messaging\FlashMessage::WARNING - ); - /** @var \TYPO3\CMS\Core\Messaging\FlashMessage $message */ - $customMessages .= '<br />' . $message->render(); - } + $customMessages .= implode(PHP_EOL, $this->errors); if ($this->convertedLinkCounter == 0) { - // no links converted only missing files: UPDATE was not successful + // no links converted only missing files: UPDATE was not successful return FALSE; } } if ($this->convertedLinkCounter > 0) { - $customMessages = $this->convertedLinkCounter . ' links converted.<br />' . $customMessages; + $customMessages = $this->convertedLinkCounter . ' links converted.' . PHP_EOL . $customMessages; } else { $customMessages .= 'No file links found'; } diff --git a/typo3/sysext/install/Classes/Updates/RteMagicImagesUpdateWizard.php b/typo3/sysext/install/Classes/Updates/RteMagicImagesUpdateWizard.php index 7281652f4dc9f212237629420c1e797dcb6d5cfd..1fd46b569d42ad8329891c2b976e905d44b91f53 100644 --- a/typo3/sysext/install/Classes/Updates/RteMagicImagesUpdateWizard.php +++ b/typo3/sysext/install/Classes/Updates/RteMagicImagesUpdateWizard.php @@ -158,12 +158,8 @@ class RteMagicImagesUpdateWizard extends AbstractUpdate { $this->logger->notice('File ' . $sourceFileName . ' does not exist. Reference was not migrated.', array()); $format = 'File \'%s\' does not exist. Referencing field: %s.%d.%s. The reference was not migrated.'; - $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('\TYPO3\CMS\Core\Messaging\FlashMessage', - sprintf($format, $sourceFileName, $refRecord['tablename'], $refRecord['recuid'], $refRecord['field']), - '', \TYPO3\CMS\Core\Messaging\FlashMessage::WARNING - ); - /** @var \TYPO3\CMS\Core\Messaging\FlashMessage $message */ - $customMessages .= '<br />' . $message->render(); + $message = sprintf($format, $sourceFileName, $refRecord['tablename'], $refRecord['recuid'], $refRecord['field']); + $customMessages .= PHP_EOL . $message; continue; } diff --git a/typo3/sysext/install/Classes/Updates/TceformsUpdateWizard.php b/typo3/sysext/install/Classes/Updates/TceformsUpdateWizard.php index e9551e6119cf3f98f9646ff750ecc4d74b9c7522..9550310a615756be15e962554463c61163823ef0 100644 --- a/typo3/sysext/install/Classes/Updates/TceformsUpdateWizard.php +++ b/typo3/sysext/install/Classes/Updates/TceformsUpdateWizard.php @@ -332,12 +332,8 @@ class TceformsUpdateWizard extends AbstractUpdate { ); $format = 'File \'%s\' does not exist. Referencing field: %s.%d.%s. The reference was not migrated.'; - $message = GeneralUtility::makeInstance('\TYPO3\CMS\Core\Messaging\FlashMessage', - sprintf($format, $fieldConfiguration['sourcePath'] . $item, $table, $row['uid'], $fieldname), - '', \TYPO3\CMS\Core\Messaging\FlashMessage::WARNING - ); - /** @var \TYPO3\CMS\Core\Messaging\FlashMessage $message */ - $customMessages .= '<br />' . $message->render(); + $message = sprintf($format, $fieldConfiguration['sourcePath'] . $item, $table, $row['uid'], $fieldname); + $customMessages .= PHP_EOL . $message; continue; }