tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

BUGFIX: Allow execution of actions (such as Page's search) on ErrorPage; limit the 404 display to the index() action

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@75096 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2009-04-24 04:46:40 +00:00
parent 8a1d21b8af
commit 35a3cd9257
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/control/RequestHandler.php
View File

@ -133,7 +133,7 @@ class RequestHandler extends ViewableData {
// But if we have more content on the URL and we don't know what to do with it, return an error. // But if we have more content on the URL and we don't know what to do with it, return an error.
} else { } else {
return $this->httpError(400, "I can't handle sub-URLs of a $this->class object."); return $this->httpError(404, "I can't handle sub-URLs of a $this->class object.");
} }
return $this; return $this;

4
core/model/ErrorPage.php
View File

@ -183,9 +183,7 @@ class ErrorPage extends Page {
* @package cms * @package cms
*/ */
class ErrorPage_Controller extends Page_Controller { class ErrorPage_Controller extends Page_Controller {
public function init() { public function index() {
parent::init();
Director::set_status_code($this->failover->ErrorCode ? $this->failover->ErrorCode : 404); Director::set_status_code($this->failover->ErrorCode ? $this->failover->ErrorCode : 404);
} }
} }