diff --git a/typo3/sysext/core/Classes/Messaging/ErrorpageMessage.php b/typo3/sysext/core/Classes/Messaging/ErrorpageMessage.php
index 57c325eb4d4575f8b3b6c6721fbc8fe0d841ae54..06da9decd60711644f68f37a371a6ae7157ee7f9 100644
--- a/typo3/sysext/core/Classes/Messaging/ErrorpageMessage.php
+++ b/typo3/sysext/core/Classes/Messaging/ErrorpageMessage.php
@@ -30,7 +30,21 @@ class ErrorpageMessage extends AbstractStandaloneMessage
*/
public function __construct($message = '', $title = '', $severity = AbstractMessage::ERROR)
{
- $this->setHtmlTemplate(ExtensionManagementUtility::siteRelPath('t3skin') . 'templates/errorpage-message.html');
+ $this->setHtmlTemplate(ExtensionManagementUtility::siteRelPath('core') . 'Resources/Private/Templates/Page/Error.html');
parent::__construct($message, $title, $severity);
}
+
+ /**
+ * Returns the default markers for the template, with some additional parameters for the error page.
+ *
+ * @return array
+ */
+ protected function getDefaultMarkers()
+ {
+ $defaultMarkers = parent::getDefaultMarkers();
+ $defaultMarkers['###EXTPATH_CORE###'] = ExtensionManagementUtility::siteRelPath('core');
+ $defaultMarkers['###EXTPATH_BACKEND###'] = ExtensionManagementUtility::siteRelPath('backend');
+ return $defaultMarkers;
+ }
+
}
diff --git a/typo3/sysext/t3skin/templates/errorpage-message.html b/typo3/sysext/core/Resources/Private/Templates/Page/Error.html
similarity index 86%
rename from typo3/sysext/t3skin/templates/errorpage-message.html
rename to typo3/sysext/core/Resources/Private/Templates/Page/Error.html
index 5e8ff1c8eec71ef096ac30ff163ae9405584acdd..3232b903b09920a6d7396022cdc7a0478fff9d9c 100644
--- a/typo3/sysext/t3skin/templates/errorpage-message.html
+++ b/typo3/sysext/core/Resources/Private/Templates/Page/Error.html
@@ -8,7 +8,7 @@
<base href="###BASEURL###" />
- <link rel="stylesheet" href="###TYPO3_mainDir###sysext/t3skin/stylesheets/standalone/errorpage-message.css" />
+ <link rel="stylesheet" href="###EXTPATH_CORE###Resources/Public/Css/errorpage-message.css" />
</head>
<body class="t3-message-page t3-###CSS_CLASS###page-message">
@@ -16,7 +16,7 @@
<div class="t3-error-wrap">
<div class="t3-message-page-container">
<div class="t3-message-page-logo">
- <img src="###TYPO3_mainDir###sysext/backend/Resources/Public/Images/typo3_orange.svg" class="typo3-error-image" alt="TYPO3 logo">
+ <img src="###EXTPATH_BACKEND###Resources/Public/Images/typo3_orange.svg" class="typo3-error-image" alt="TYPO3 logo">
</div>
<div class="callout callout-danger">
<div class="media">
diff --git a/typo3/sysext/t3skin/stylesheets/standalone/errorpage-message.css b/typo3/sysext/core/Resources/Public/Css/errorpage-message.css
similarity index 100%
rename from typo3/sysext/t3skin/stylesheets/standalone/errorpage-message.css
rename to typo3/sysext/core/Resources/Public/Css/errorpage-message.css