Skip to content

Y
yii2
Commit 65774b28 by Qiang Xue
Options

Merge pull request #2075 from lucianobaraglia/2036-deny-callback-call

AccessControl denyCallback call fix - #2036
parents 1181b7b9 701852e9
Showing with 4 additions and 5 deletions
framework/web/AccessControl.php
...@@ -108,9 +108,9 @@ class AccessControl extends ActionFilter ...@@ -108,9 +108,9 @@ class AccessControl extends ActionFilter
return true; return true;
} elseif ($allow === false) { } elseif ($allow === false) {
if (isset($rule->denyCallback)) { if (isset($rule->denyCallback)) {
call_user_func($rule->denyCallback, $rule); call_user_func($rule->denyCallback, $rule, $action);
} elseif (isset($this->denyCallback)) { } elseif (isset($this->denyCallback)) {
call_user_func($this->denyCallback, $rule); call_user_func($this->denyCallback, $rule, $action);
} else { } else {
$this->denyAccess($user); $this->denyAccess($user);
} }
...@@ -118,9 +118,8 @@ class AccessControl extends ActionFilter ...@@ -118,9 +118,8 @@ class AccessControl extends ActionFilter
} }
} }
if (isset($this->denyCallback)) { if (isset($this->denyCallback)) {
call_user_func($this->denyCallback, $rule); call_user_func($this->denyCallback, $rule, $action);
} } else {
else {
$this->denyAccess($user); $this->denyAccess($user);
} }
return false; return false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment