TYPO3 Core

If improved 404 handling is used (e.g. [FE][pageNotFound_handling] = /http-error-404-page/) , there is no possibility to show the URI, that was not found. REQUEST_URI will be overwritten in typo3/sysext/cms/tslib/class.tslib_fe.php.

An easy solution is a marker replacement , like it is used already in class tslib_fe.
If the following solution is realized, ###CURRENT_URL### will be replaced, if it is used in the bodytext of the error page.

It is only one line code more. There are no problems to be expected :-)

SOLUTION:
Insert one new line in typo3/sysext/cms/tslib/class.tslib_fe.php:

Before:
// Put <base> if necesary
if ($checkBaseTag) { [...] }

NEW - insert - line 1381
$content = str_replace('###CURRENT_URL###', t3lib_div::getIndpEnv('REQUEST_URI'), $content);

After:
echo $content; // Output the content
(issue imported from #M8834)