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

Merge pull request #1741 from kinglozzer/1696_handlerequest_fix

Browse Source 
Fix: RequestHandler not managing 404/403 errors correctly (fixes #1696)
This commit is contained in:
Ingo Schommer 2013-04-09 07:52:20 -07:00
commit 5fbf2e9303
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
control/RequestHandler.php
View File

@ -180,15 +180,13 @@ class RequestHandler extends ViewableData {
$className = get_class($this); $className = get_class($this);
if(!$this->hasAction($action)) {
return new SS_HTTPResponse("Action '$action' isn't available on class $className.", 404);
}
if(!$this->checkAccessAction($action) || in_array(strtolower($action), array('run', 'init'))) {
return new SS_HTTPResponse("Action '$action' isn't allowed on class $className.", 403);
}
try { try {
if(!$this->hasAction($action)) {
return $this->httpError(404, "Action '$action' isn't available on class $className.");
}
if(!$this->checkAccessAction($action) || in_array(strtolower($action), array('run', 'init'))) {
return $this->httpError(403, "Action '$action' isn't allowed on class $className.");
}
$result = $this->handleAction($request, $action); $result = $this->handleAction($request, $action);
} }
catch (SS_HTTPResponse_Exception $e) { catch (SS_HTTPResponse_Exception $e) {