diff --git a/cake/libs/controller/components/acl.php b/cake/libs/controller/components/acl.php index 317d9cb01..a79ea0a26 100644 --- a/cake/libs/controller/components/acl.php +++ b/cake/libs/controller/components/acl.php @@ -315,7 +315,7 @@ class DB_ACL extends AclBase { foreach ($permKeys as $key) { if (!empty($perm)) { - if ($perm[$key] === -1) { + if ($perm[$key] == -1) { return false; } elseif ($perm[$key] == 1) { $inherited[$key] = 1; diff --git a/cake/tests/cases/libs/controller/components/acl.test.php b/cake/tests/cases/libs/controller/components/acl.test.php index 17eda6aa7..75508c55f 100644 --- a/cake/tests/cases/libs/controller/components/acl.test.php +++ b/cake/tests/cases/libs/controller/components/acl.test.php @@ -249,6 +249,32 @@ class AclComponentTest extends CakeTestCase { $result = $this->Acl->check('Secretary','Links','delete'); $this->assertFalse($result); + + $result = $this->Acl->check('Secretary','Links','read'); + $this->assertTrue($result); + + $result = $this->Acl->check('Secretary','Links','create'); + $this->assertTrue($result); + + $result = $this->Acl->check('Secretary','Links','update'); + $this->assertTrue($result); + + $this->Acl->deny('Secretary','Links', '*'); + + $result = $this->Acl->check('Secretary','Links','delete'); + $this->assertFalse($result); + + $result = $this->Acl->check('Secretary','Links','read'); + $this->assertFalse($result); + + $result = $this->Acl->check('Secretary','Links','create'); + $this->assertFalse($result); + + $result = $this->Acl->check('Secretary','Links','update'); + $this->assertFalse($result); + + $result = $this->Acl->check('Secretary','Links'); + $this->assertFalse($result); } function tearDown() { diff --git a/cake/tests/cases/libs/validation.test.php b/cake/tests/cases/libs/validation.test.php index cb1ffb7ec..0cba3af5d 100644 --- a/cake/tests/cases/libs/validation.test.php +++ b/cake/tests/cases/libs/validation.test.php @@ -1267,7 +1267,7 @@ class ValidationTestCase extends UnitTestCase { $this->assertTrue(Validation::extension('extension.png')); $this->assertTrue(Validation::extension('extension.jpg')); $this->assertTrue(Validation::extension('extension.JPG')); - $this->assertFalse(Validation::file('noextension')); + $this->assertFalse(Validation::extension('noextension')); $this->assertTrue(Validation::extension('extension.pdf', array('PDF'))); $this->assertFalse(Validation::extension('extension.jpg', array('GIF'))); $this->assertTrue(Validation::extension(array('extension.JPG', 'extension.gif', 'extension.png'))); @@ -1282,5 +1282,14 @@ class ValidationTestCase extends UnitTestCase { $this->assertFalse(Validation::extension(array('noextension', 'extension.JPG', 'extension.gif', 'extension.png'))); $this->assertFalse(Validation::extension(array('extension.pdf', 'extension.JPG', 'extension.gif', 'extension.png'))); } +/* + function TestFile() { + $this->assertTrue(Validation::file(WWW_ROOT . 'img' . DS . 'cake.icon.gif')); + $this->assertTrue(Validation::file(WWW_ROOT. 'favicon.ico')); + $this->assertTrue(Validation::file(WWW_ROOT. 'index.php')); + $this->assertTrue(Validation::file(WWW_ROOT. 'css' . DS . 'cake.generic.css')); + $this->assertTrue(Validation::file(TEST_CAKE_CORE_INCLUDE_PATH. 'VERSION.txt')); + } +*/ } ?> \ No newline at end of file