tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

FIX Use RequestHandler::httpError() for all HTTP errors.

Browse Source 
https://github.com/silverstripe/sapphire/pull/827 adds some extension points for catching HTTP errors such as 404.  This change fixes some issues where httpError() isn't used all the time.  Note that the aforementioned pull request will be necessary to ensure that it works properly.
This commit is contained in:
Sam Minnee 2012-09-27 12:30:44 +12:00
parent 686f70330b
commit 39792debb8
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
code/controllers/ContentController.php
View File

@ -205,11 +205,10 @@ class ContentController extends Controller {
* @uses ErrorPage::response_for() * @uses ErrorPage::response_for()
*/ */
public function httpError($code, $message = null) { public function httpError($code, $message = null) {
if($this->request->isMedia() || !$response = ErrorPage::response_for($code)) { // Don't use the HTML response for media requests
parent::httpError($code, $message); $response = $this->request->isMedia() ? null : ErrorPage::response_for($code);
} else { // Failover to $message if the HTML response is unavailable / inappropriate
throw new SS_HTTPResponse_Exception($response); parent::httpError($code, $response ? $response : $message);
}
} }
/** /**

7
code/controllers/ModelAsController.php
View File

@ -126,11 +126,8 @@ class ModelAsController extends Controller implements NestedController {
return $this->response; return $this->response;
} }
if($response = ErrorPage::response_for(404)) { $response = ErrorPage::response_for(404);
return $response; $this->httpError(404, $response ? $response : 'The requested page could not be found.');
} else {
$this->httpError(404, 'The requested page could not be found.');
}
} }
// Enforce current locale setting to the loaded SiteTree object // Enforce current locale setting to the loaded SiteTree object