Skip to content
Permalink
Browse files

FIX (v3.1) for #1294 to workaround ErrorPage fatal errors (and undefi…

…ned var) when publishing.
  • Loading branch information...
patricknelson committed Oct 8, 2015
1 parent 0df0f35 commit ff6c0a3160c5eb3ca624efea6585efb44399dc1c
Showing with 7 additions and 5 deletions.
  1. +7 −5 code/model/ErrorPage.php
@@ -222,10 +222,10 @@ public function getCMSFields() {
* 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 @@ public function doPublish() {
$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;
}
/**

0 comments on commit ff6c0a3

Please sign in to comment.
You can’t perform that action at this time.