From 6fe40b055fe70db755f91316299002000aad3756 Mon Sep 17 00:00:00 2001 From: shustrik Date: Thu, 6 Feb 2014 16:18:35 +0300 Subject: [PATCH] fix return walker --- lib/Doctrine/ORM/Query/TreeWalkerChain.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Doctrine/ORM/Query/TreeWalkerChain.php b/lib/Doctrine/ORM/Query/TreeWalkerChain.php index 72027ce14..feb1f2556 100644 --- a/lib/Doctrine/ORM/Query/TreeWalkerChain.php +++ b/lib/Doctrine/ORM/Query/TreeWalkerChain.php @@ -633,10 +633,10 @@ class TreeWalkerChain implements TreeWalker private function getWalker($walkerClass) { $key = array_search($walkerClass, $this->_walkersClasses); - if (isset($this->_walkers[$key])) { - return $this->_walkers[$key]; + if (!isset($this->_walkers[$key])) { + $this->_walkers[$key] = new $walkerClass($this->_query, $this->_parserResult, $this->_queryComponents); } - return new $walkerClass($this->_query, $this->_parserResult, $this->_queryComponents); + return $this->_walkers[$key]; } }