Fixes phalcon#12333

Jurigag · Oct 19, 2016 · ca9be52 · ca9be52
1 parent db63b9b
commit ca9be52
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,7 @@
 - Fixed `Phalcon\Tag::resetInput` for proper use without attempts to clear `$_POST` [#12099](https://github.com/phalcon/cphalcon/issues/12099)
 - Fixed `Phalcon\Db\Dialect\Mysql` and `Phalcon\Db\Dialect\Postresql` to correctly check schema in missing methods
 - Fixed `Phalcon\Cache\Backend\Apc::flush` to remove only it's own keys by prefix [#12153](https://github.com/phalcon/cphalcon/issues/12153)
+- Fixed `Phalcon\Acl\Adapter\Memory::isAllowed` to call closures when using wildcard [#12333](https://github.com/phalcon/cphalcon/issues/12333)
 
 # [3.0.1](https://github.com/phalcon/cphalcon/releases/tag/v3.0.1) (2016-08-24)
 - Fixed `Phalcon\Cache\Backend\Redis::flush` in order to flush cache correctly

diff --git a/phalcon/acl/adapter/memory.zep b/phalcon/acl/adapter/memory.zep
@@ -622,6 +622,7 @@ class Memory extends Adapter
 			 */
 			if isset accessList[accessKey] {
 				let haveAccess = accessList[accessKey];
+				fetch funcAccess, funcList[accessKey];
 			} else {
 				if typeof inheritedRoles == "array" {
 					for inheritedRole in inheritedRoles {
@@ -652,6 +653,7 @@ class Memory extends Adapter
 			 */
 			if isset accessList[accessKey] {
 				let haveAccess = accessList[accessKey];
+				fetch funcAccess, funcList[accessKey];
 			} else {
 				if typeof inheritedRoles == "array" {
 					for inheritedRole in inheritedRoles {