summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2012-08-02 12:55:05 +0800
committerXinchen Hui <laruence@php.net>2012-08-02 12:55:05 +0800
commit53c8612fe780a80fde64da118587e6096b16b595 (patch)
treef2f341f887793277ca0792f3c1b07ab236fd0846
parent80520d0903b0726d3ce6121e2fd80438f9754468 (diff)
downloadphp-git-53c8612fe780a80fde64da118587e6096b16b595.tar.gz
Fixed bug #62685 (Wrong return datatype in PDO::inTransaction())
-rw-r--r--NEWS3
-rwxr-xr-xext/pdo/pdo_dbh.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 084f3cd0bb..6b0d2d94be 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2012, PHP 5.4.7
+- PDO:
+ . Fixed bug #62685 (Wrong return datatype in PDO::inTransaction()). (Laruence)
+
- Reflection:
. Fixed bug #62715 (ReflectionParameter::isDefaultValueAvailable() wrong
result). (Laruence)
diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
index b4f383c94f..acdc0dd90d 100755
--- a/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c
@@ -700,7 +700,7 @@ static PHP_METHOD(PDO, inTransaction)
RETURN_BOOL(dbh->in_txn);
}
- RETURN_LONG(dbh->methods->in_transaction(dbh TSRMLS_CC));
+ RETURN_BOOL(dbh->methods->in_transaction(dbh TSRMLS_CC));
}
/* }}} */