From d44abb331fc125b6507472966953fdfdc5bff8d0 Mon Sep 17 00:00:00 2001 From: Jose Lorenzo Rodriguez Date: Thu, 7 Mar 2013 23:18:45 +0100 Subject: [PATCH] Inverting function names for internal closures in _bindParams as they make more sense now --- lib/Cake/Model/Datasource/Database/Query.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/Cake/Model/Datasource/Database/Query.php b/lib/Cake/Model/Datasource/Database/Query.php index 6c6c98fd8a0..b9181c47a57 100644 --- a/lib/Cake/Model/Datasource/Database/Query.php +++ b/lib/Cake/Model/Datasource/Database/Query.php @@ -1433,7 +1433,7 @@ protected function _conjugate($part, $append, $conjunction, $types) { * @return void */ protected function _bindParams($statement) { - $visitor = function($expression) use ($statement) { + $binder = function($expression) use ($statement) { $params = $types = []; if ($expression instanceof Comparison) { @@ -1450,10 +1450,10 @@ protected function _bindParams($statement) { }; $refs = []; - $binder = function($expression, $name = null) use ($statement, $visitor, &$binder, &$refs) { + $visitor = function($expression, $name = null) use ($statement, &$visitor, $binder, &$refs) { if (is_array($expression)) { foreach ($expression as $e) { - $binder($e, $name); + $visitor($e, $name); } return; } @@ -1466,15 +1466,15 @@ protected function _bindParams($statement) { } $refs[$id] = 1; - $expression->traverse($binder); + $expression->traverse($visitor); if (!($expression instanceof self)) { - $visitor($expression); + $binder($expression); } } }; - $this->_transformQuery()->traverse($binder); + $this->_transformQuery()->traverse($visitor); } /**