tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-06-14 16:51:37 +02:00
Code Issues Projects Releases Wiki Activity

FIX (v3.1) for #1294 to workaround ErrorPage fatal errors (and undefined var) when publishing.

Browse Source
This commit is contained in:
Patrick Nelson 2015-10-08 17:48:00 -04:00
parent 0df0f35278
commit ff6c0a3160
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/model/ErrorPage.php
View File

@ -222,10 +222,10 @@ class ErrorPage extends Page {
* content, so the page can be shown even when SilverStripe is not
* functioning correctly before publishing this page normally.
*
* @return void
* @return bool
*/
public function doPublish() {
parent::doPublish();
if (!parent::doPublish()) return false;
// Run the page (reset the theme, it might've been disabled by LeftAndMain::init())
$oldEnabled = Config::inst()->get('SSViewer', 'theme_enabled');
@ -255,11 +255,13 @@ class ErrorPage extends Page {
$fileErrorText = _t(
"ErrorPage.ERRORFILEPROBLEM",
"Error opening file \"{filename}\" for writing. Please check file permissions.",
array('filename' => $errorFile)
array('filename' => $filePath)
);
$this->response->addHeader('X-Status', rawurlencode($fileErrorText));
return $this->httpError(405);
user_error($fileErrorText, E_USER_WARNING);
return false;
}
return true;
}
/**