From 074a434ae2fa3e6c8a07892dd8af7ff1209b59f6 Mon Sep 17 00:00:00 2001
From: zYne <zYne@625475ce-881a-0410-a577-b389adb331d8>
Date: Thu, 24 May 2007 17:13:59 +0000
Subject: [PATCH]

---
 lib/Doctrine/Query.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/Doctrine/Query.php b/lib/Doctrine/Query.php
index ffa9bfff7..073dabb30 100644
--- a/lib/Doctrine/Query.php
+++ b/lib/Doctrine/Query.php
@@ -249,7 +249,7 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable
     	} else {
             $this->_dqlParts[$queryPartName] = array($queryPart);
     	}
-    	if ($this->_options['resultSetCache'] || $this->_options['parserCache']) {
+    	if ( ! $this->_options['resultSetCache'] && ! $this->_options['parserCache']) {
     	   $this->getParser($queryPartName)->parse($queryPart);
     	}
     	   
@@ -432,8 +432,6 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable
 
             $sql = $this->createSubquery()->parseQuery($dql, false)->getQuery();
 
-
-
             reset($this->_aliasMap);
             $componentAlias = key($this->_aliasMap);
             $tableAlias = $this->getTableAlias($componentAlias);
@@ -687,7 +685,7 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable
         }
 
         // append sql query into cache
-    	if ($this->_options['parserCache'] !== false) {  
+    	if ($this->_options['parserCache'] !== false) {
             $this->_options['parserCache']->save($hash, $q);
         }
         return $q;