Commit:    53c8612fe780a80fde64da118587e6096b16b595
Author:    Xinchen Hui <larue...@php.net>         Thu, 2 Aug 2012 12:55:05 +0800
Parents:   80520d0903b0726d3ce6121e2fd80438f9754468
Branches:  PHP-5.4

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=53c8612fe780a80fde64da118587e6096b16b595

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

Bugs:
https://bugs.php.net/62685

Changed paths:
  M  NEWS
  M  ext/pdo/pdo_dbh.c


Diff:
diff --git a/NEWS b/NEWS
index 084f3cd..6b0d2d9 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 b4f383c..acdc0dd 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));
 }
 /* }}} */


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to