Merge remote-tracking branch 'origin/2.2' into 2.2

doctrine · May 5, 2012 · 15c2323 · 15c2323
2 parents c147adf + 79f59d1
commit 15c2323
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/Doctrine/DBAL/Connection.php b/lib/Doctrine/DBAL/Connection.php
@@ -565,7 +565,7 @@ public function quote($input, $type = null)
         $this->connect();
 
         list($value, $bindingType) = $this->getBindingInfo($input, $type);
-        return $this->_conn->quote($input, $bindingType);
+        return $this->_conn->quote($value, $bindingType);
     }
 
     /**

diff --git a/lib/Doctrine/DBAL/Version.php b/lib/Doctrine/DBAL/Version.php
@@ -36,7 +36,7 @@ class Version
     /**
      * Current Doctrine Version
      */
-    const VERSION = '2.2.2-DEV';
+    const VERSION = '2.2.3-DEV';
 
     /**
      * Compares a Doctrine version with the current one.

diff --git a/lib/vendor/doctrine-common b/lib/vendor/doctrine-common