summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2012-08-02 12:52:11 +0800
committerXinchen Hui <laruence@php.net>2012-08-02 12:52:11 +0800
commitcd896d69d90c70fd13efec315fd8b1f6647497b9 (patch)
tree39110a4651318fcaa7c11a3ed007a465969f59d8
parent433089ccb4d4747a01d522e8678664ff17584615 (diff)
downloadphp-git-cd896d69d90c70fd13efec315fd8b1f6647497b9.tar.gz
Fixed bug #62685 (Wrong return datatype in PDO::inTransaction())
-rw-r--r--NEWS5
-rwxr-xr-xext/pdo/pdo_dbh.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 97fc6d626d..05a80eb6e7 100644
--- a/NEWS
+++ b/NEWS
@@ -13,7 +13,10 @@ PHP NEWS
(r.hampartsumyan@gmail.com, Laruence)
- DateTime:
- . Fixed Bug #62500 (Segfault in DateInterval class when extended). (Laruence)
+ . Fixed bug #62500 (Segfault in DateInterval class when extended). (Laruence)
+
+- PDO:
+ . Fixed bug #62685 (Wrong return datatype in PDO::inTransaction()). (Laruence)
- Reflection:
. Fixed bug #62715 (ReflectionParameter::isDefaultValueAvailable() wrong
diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
index 6b3ba3bb1b..4035b2b910 100755
--- a/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c
@@ -694,7 +694,7 @@ static PHP_METHOD(PDO, inTransaction)
}
PDO_CONSTRUCT_CHECK;
- RETURN_LONG(dbh->in_txn);
+ RETURN_BOOL(dbh->in_txn);
}
/* }}} */