mirror of
https://github.com/silverstripe/silverstripe-reports
synced 2024-10-22 11:05:53 +02:00
Merge pull request #1296 from patricknelson/issue-1294-errorpage-fatal-3.1
FIX (v3.1) for #1294 to workaround ErrorPage fatal errors (and undefined var) when publishing.
This commit is contained in:
commit
b302a9a9be
@ -222,10 +222,10 @@ class ErrorPage extends Page {
|
|||||||
* content, so the page can be shown even when SilverStripe is not
|
* content, so the page can be shown even when SilverStripe is not
|
||||||
* functioning correctly before publishing this page normally.
|
* functioning correctly before publishing this page normally.
|
||||||
*
|
*
|
||||||
* @return void
|
* @return bool
|
||||||
*/
|
*/
|
||||||
public function doPublish() {
|
public function doPublish() {
|
||||||
parent::doPublish();
|
if (!parent::doPublish()) return false;
|
||||||
|
|
||||||
// Run the page (reset the theme, it might've been disabled by LeftAndMain::init())
|
// Run the page (reset the theme, it might've been disabled by LeftAndMain::init())
|
||||||
$oldEnabled = Config::inst()->get('SSViewer', 'theme_enabled');
|
$oldEnabled = Config::inst()->get('SSViewer', 'theme_enabled');
|
||||||
@ -255,11 +255,13 @@ class ErrorPage extends Page {
|
|||||||
$fileErrorText = _t(
|
$fileErrorText = _t(
|
||||||
"ErrorPage.ERRORFILEPROBLEM",
|
"ErrorPage.ERRORFILEPROBLEM",
|
||||||
"Error opening file \"{filename}\" for writing. Please check file permissions.",
|
"Error opening file \"{filename}\" for writing. Please check file permissions.",
|
||||||
array('filename' => $errorFile)
|
array('filename' => $filePath)
|
||||||
);
|
);
|
||||||
$this->response->addHeader('X-Status', rawurlencode($fileErrorText));
|
user_error($fileErrorText, E_USER_WARNING);
|
||||||
return $this->httpError(405);
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user