mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
BUGFIX Fixed reverted access checks in Controller->handleAction() due to merge error
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60219 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
d6967f10f1
commit
76bfb05bda
@ -97,7 +97,7 @@ class Controller extends RequestHandlingData {
|
||||
$methodName = $this->action;
|
||||
|
||||
// run & init are manually disabled, because they create infinite loops and other dodgy situations
|
||||
if(!$this->checkAccessAction($this->action) || in_array(strtolower($this->action), array('run', 'init'))) {
|
||||
if($this->checkAccessAction($this->action) && !in_array(strtolower($this->action), array('run', 'init'))) {
|
||||
if($this->hasMethod($methodName)) {
|
||||
$result = $this->$methodName($request);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user