From 2ce1c5f483dacc60dc1b1b17f1ea7ccd1208c0cb Mon Sep 17 00:00:00 2001
From: zYne <zYne@625475ce-881a-0410-a577-b389adb331d8>
Date: Thu, 24 May 2007 17:49:15 +0000
Subject: [PATCH]

---
 lib/Doctrine/Hydrate.php        | 10 +++++-----
 lib/Doctrine/Query.php          |  2 +-
 lib/Doctrine/Query/Abstract.php | 20 ++++++++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/Doctrine/Hydrate.php b/lib/Doctrine/Hydrate.php
index d182ec8b0..71bd376ae 100644
--- a/lib/Doctrine/Hydrate.php
+++ b/lib/Doctrine/Hydrate.php
@@ -62,7 +62,7 @@ class Doctrine_Hydrate
     /**
      * @var array $params                       query input parameters
      */
-    protected $params      = array();
+    protected $_params      = array();
     /**
      * @var Doctrine_Connection $conn           Doctrine_Connection object
      */
@@ -84,7 +84,7 @@ class Doctrine_Hydrate
      *
      *          subAgg              the subquery aggregates of this component
      */
-    protected $_aliasMap        = array();
+    protected $_aliasMap         = array();
     /**
      *
      */
@@ -386,7 +386,7 @@ class Doctrine_Hydrate
      */
     public function getParams()
     {
-        return $this->params;
+        return $this->_params;
     }
     /**
      * setParams
@@ -394,7 +394,7 @@ class Doctrine_Hydrate
      * @param array $params
      */
     public function setParams(array $params = array()) {
-        $this->params = $params;
+        $this->_params = $params;
     }
     public function convertEnums($params)
     {
@@ -445,7 +445,7 @@ class Doctrine_Hydrate
      */
     public function execute($params = array(), $return = Doctrine::FETCH_RECORD)
     {
-        $params = $this->_conn->convertBooleans(array_merge($this->params, $params));
+        $params = $this->_conn->convertBooleans(array_merge($this->_params, $params));
         $params = $this->convertEnums($params);
 
         if ( ! $this->_view) {
diff --git a/lib/Doctrine/Query.php b/lib/Doctrine/Query.php
index 137c3e239..7f75a8bba 100644
--- a/lib/Doctrine/Query.php
+++ b/lib/Doctrine/Query.php
@@ -1133,7 +1133,7 @@ class Doctrine_Query extends Doctrine_Query_Abstract implements Countable
             $params = array($params);
         }
         // append parameters
-        $params = array_merge($this->params, $params);
+        $params = array_merge($this->_params, $params);
 
 		return (int) $this->getConnection()->fetchOne($q, $params);
 	}
diff --git a/lib/Doctrine/Query/Abstract.php b/lib/Doctrine/Query/Abstract.php
index 1e6bc29d1..87806d90a 100644
--- a/lib/Doctrine/Query/Abstract.php
+++ b/lib/Doctrine/Query/Abstract.php
@@ -54,9 +54,9 @@ abstract class Doctrine_Query_Abstract extends Doctrine_Hydrate
     public function addWhere($where, $params = array())
     {
         if (is_array($params)) {
-            $this->params = array_merge($this->params, $params);
+            $this->_params = array_merge($this->_params, $params);
         } else {
-            $this->params[] = $params;
+            $this->_params[] = $params;
         }
         return $this->parseQueryPart('where', $where, true);
     }
@@ -82,9 +82,9 @@ abstract class Doctrine_Query_Abstract extends Doctrine_Hydrate
     public function addHaving($having, $params = array())
     {
         if (is_array($params)) {
-            $this->params = array_merge($this->params, $params);
+            $this->_params = array_merge($this->_params, $params);
         } else {
-            $this->params[] = $params;
+            $this->_params[] = $params;
         }
         return $this->parseQueryPart('having', $having, true);
     }
@@ -227,11 +227,11 @@ abstract class Doctrine_Query_Abstract extends Doctrine_Hydrate
      */
     public function where($where, $params = array())
     {
-        $this->params = array();
+        $this->_params = array();
         if (is_array($params)) {
-            $this->params = $params;
+            $this->_params = $params;
         } else {
-            $this->params[] = $params;
+            $this->_params[] = $params;
         }
 
         return $this->parseQueryPart('where', $where);
@@ -246,11 +246,11 @@ abstract class Doctrine_Query_Abstract extends Doctrine_Hydrate
      */
     public function having($having, $params = array())
     {
-        $this->params = array();
+        $this->_params = array();
         if (is_array($params)) {
-            $this->params = $params;
+            $this->_params = $params;
         } else {
-            $this->params[] = $params;
+            $this->_params[] = $params;
         }
         
         return $this->parseQueryPart('having', $having);