Commit 15c23239 authored by Benjamin Eberlei's avatar Benjamin Eberlei

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

parents c147adf1 79f59d1f
...@@ -565,7 +565,7 @@ class Connection implements DriverConnection ...@@ -565,7 +565,7 @@ class Connection implements DriverConnection
$this->connect(); $this->connect();
list($value, $bindingType) = $this->getBindingInfo($input, $type); list($value, $bindingType) = $this->getBindingInfo($input, $type);
return $this->_conn->quote($input, $bindingType); return $this->_conn->quote($value, $bindingType);
} }
/** /**
......
...@@ -36,7 +36,7 @@ class Version ...@@ -36,7 +36,7 @@ class Version
/** /**
* Current Doctrine Version * Current Doctrine Version
*/ */
const VERSION = '2.2.2-DEV'; const VERSION = '2.2.3-DEV';
/** /**
* Compares a Doctrine version with the current one. * Compares a Doctrine version with the current one.
......
Subproject commit 84838bb8c9896cea6210050a2e1264ee9592ca1b Subproject commit 14eb4d62b6e0a87cd99200078c38644bbd216e42
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