Merge pull request #5236 from dhensby/pulls/3.2/avoid-plain-text-friendlyerrors

FIX Dont allow plain text friendly errors
This commit is contained in:
Damian Mooyman 2016-04-12 12:00:54 +12:00
commit e1f281fd8b

View File

@ -340,6 +340,7 @@ class Debug {
if(Director::is_ajax()) {
echo $friendlyErrorMessage;
} else {
if(!headers_sent()) header('Content-Type: text/html');
if(class_exists('ErrorPage')){
$errorFilePath = ErrorPage::get_filepath_for_errorcode(
$statusCode,
@ -347,7 +348,6 @@ class Debug {
);
if(file_exists($errorFilePath)) {
$content = file_get_contents($errorFilePath);
if(!headers_sent()) header('Content-Type: text/html');
// $BaseURL is left dynamic in error-###.html, so that multi-domain sites don't get broken
echo str_replace('$BaseURL', Director::absoluteBaseURL(), $content);
}