Applying optimization from 'michaelc' to reduce number of strtolower(…

…) calls in AclBehavior. Fixes #972
cakephp · Jul 30, 2010 · 2b1efaf · 2b1efaf
1 parent 3bda2ce
commit 2b1efaf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/cake/libs/model/behaviors/acl.php b/cake/libs/model/behaviors/acl.php
@@ -49,6 +49,7 @@ function setup(&$model, $config = array()) {
 			$config = array('type' => $config);
 		}
 		$this->settings[$model->name] = array_merge(array('type' => 'requester'), (array)$config);
+		$this->settings[$model->name]['type'] = strtolower($this->settings[$model->name]['type']);
 
 		$type = $this->__typeMaps[$this->settings[$model->name]['type']];
 		if (!class_exists('AclNode')) {
@@ -73,7 +74,7 @@ function setup(&$model, $config = array()) {
  * @link http://book.cakephp.org/view/1322/node
  */
 	function node(&$model, $ref = null) {
-		$type = $this->__typeMaps[strtolower($this->settings[$model->name]['type'])];
+		$type = $this->__typeMaps[$this->settings[$model->name]['type']];
 		if (empty($ref)) {
 			$ref = array('model' => $model->name, 'foreign_key' => $model->id);
 		}
@@ -88,7 +89,7 @@ function node(&$model, $ref = null) {
  * @access public
  */
 	function afterSave(&$model, $created) {
-		$type = $this->__typeMaps[strtolower($this->settings[$model->alias]['type'])];
+		$type = $this->__typeMaps[$this->settings[$model->name]['type']];
 		$parent = $model->parentNode();
 		if (!empty($parent)) {
 			$parent = $this->node($model, $parent);
@@ -113,7 +114,7 @@ function afterSave(&$model, $created) {
  * @access public
  */
 	function afterDelete(&$model) {
-		$type = $this->__typeMaps[strtolower($this->settings[$model->name]['type'])];
+		$type = $this->__typeMaps[$this->settings[$model->name]['type']];
 		$node = Set::extract($this->node($model), "0.{$type}.id");
 		if (!empty($node)) {
 			$model->{$type}->delete($node);

diff --git a/cake/tests/cases/libs/model/behaviors/acl.test.php b/cake/tests/cases/libs/model/behaviors/acl.test.php
@@ -174,7 +174,7 @@ class AclPost extends CakeTestModel {
  * @var array
  * @access public
  */
-	var $actsAs = array('Acl' => 'controlled');
+	var $actsAs = array('Acl' => 'Controlled');
 
 /**
  * parentNode