Commit 8aa8c54f authored by romanb's avatar romanb

Small changes to the recent fix from jonwage

parent f123a7cd
...@@ -179,8 +179,7 @@ class Doctrine_Hydrate extends Doctrine_Object implements Serializable ...@@ -179,8 +179,7 @@ class Doctrine_Hydrate extends Doctrine_Object implements Serializable
*/ */
public function getRootAlias() public function getRootAlias()
{ {
if( !$this->_aliasMap ) if (!$this->_aliasMap) {
{
$this->getSql(); $this->getSql();
} }
......
...@@ -1534,13 +1534,13 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable ...@@ -1534,13 +1534,13 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable
public function copy(Doctrine_Query $query = null) public function copy(Doctrine_Query $query = null)
{ {
if( !$query ) if (!$query) {
{
$query = $this; $query = $this;
} }
$new = new Doctrine_Query(); $new = new Doctrine_Query();
$new->_dqlParts = $query->_dqlParts; $new->_dqlParts = $query->_dqlParts;
$new->_hydrationMode = $query->_hydrationMode;
return $new; return $new;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment