Merge pull request #100 from kamui545/2.0

Fixed 'require' error in ACLBehavior in CakePHP2.0
cakephp · May 28, 2011 · 80b70c1 · 80b70c1
2 parents f905237 + 8a701f3
commit 80b70c1
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/lib/Cake/Model/Behavior/AclBehavior.php b/lib/Cake/Model/Behavior/AclBehavior.php
@@ -18,6 +18,7 @@
  * @since         CakePHP v 1.2.0.4487
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
+App::uses('AclNode', 'Model');
 
 /**
  * ACL behavior
@@ -48,9 +49,7 @@ public function setup($model, $config = array()) {
 		$this->settings[$model->name]['type'] = strtolower($this->settings[$model->name]['type']);
 
 		$types = $this->__typeMaps[$this->settings[$model->name]['type']];
-		if (!class_exists('AclNode')) {
-			require CAKE . 'model' . DS . 'db_acl.php';
-		}
+
 		if (!is_array($types)) {
 			$types = array($types);
 		}