Fixed bug #62685 (Wrong return datatype in PDO::inTransaction())

diff --git a/NEWS b/NEWS
index 084f3cd0bb726e188015004a3ca58756816cb450..6b0d2d94be572c14cd7f018741973c4e7a644d6a 100644 (file)
--- 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 b4f383c94f01570fb250dd69ed8173d418174a4e..acdc0dd90d6169b96b5cb50eac21cf8ded268d26 100755 (executable)
--- 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));
 }
 /* }}} */