From 8aa8c54fb3fd5df1c096d894dda7e3f93c6eecb7 Mon Sep 17 00:00:00 2001 From: romanb Date: Tue, 14 Aug 2007 18:28:35 +0000 Subject: [PATCH] Small changes to the recent fix from jonwage --- lib/Doctrine/Hydrate.php | 3 +-- lib/Doctrine/Query.php | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/Doctrine/Hydrate.php b/lib/Doctrine/Hydrate.php index 02024ed09..79ef37ed2 100644 --- a/lib/Doctrine/Hydrate.php +++ b/lib/Doctrine/Hydrate.php @@ -179,8 +179,7 @@ class Doctrine_Hydrate extends Doctrine_Object implements Serializable */ public function getRootAlias() { - if( !$this->_aliasMap ) - { + if (!$this->_aliasMap) { $this->getSql(); } diff --git a/lib/Doctrine/Query.php b/lib/Doctrine/Query.php index 72ac67da8..f366281e3 100644 --- a/lib/Doctrine/Query.php +++ b/lib/Doctrine/Query.php @@ -1534,13 +1534,13 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable public function copy(Doctrine_Query $query = null) { - if( !$query ) - { + if (!$query) { $query = $this; } $new = new Doctrine_Query(); $new->_dqlParts = $query->_dqlParts; + $new->_hydrationMode = $query->_hydrationMode; return $new; }