diff --git a/lib/Cake/Model/AclNode.php b/lib/Cake/Model/AclNode.php index a689ffe0e..b11d84988 100644 --- a/lib/Cake/Model/AclNode.php +++ b/lib/Cake/Model/AclNode.php @@ -102,7 +102,7 @@ class AclNode extends Model { 'alias' => "{$type}{$i}", 'type' => 'INNER', 'conditions' => array( - $db->name("{$type}{$i}.alias") . ' = ' . $db->value($alias, 'string') + "{$type}{$i}.alias" => $alias ) ); diff --git a/lib/Cake/Test/Case/Utility/XmlTest.php b/lib/Cake/Test/Case/Utility/XmlTest.php index d0fa9d1d5..a33663f75 100644 --- a/lib/Cake/Test/Case/Utility/XmlTest.php +++ b/lib/Cake/Test/Case/Utility/XmlTest.php @@ -402,8 +402,7 @@ XML; * * @return void */ - public function testFromArrayZeroValue() - { + public function testFromArrayZeroValue() { $xml = array( 'tag' => array( '@' => 0,