Commit:    cd896d69d90c70fd13efec315fd8b1f6647497b9
Author:    Xinchen Hui <larue...@php.net>         Thu, 2 Aug 2012 12:52:11 +0800
Parents:   433089ccb4d4747a01d522e8678664ff17584615
Branches:  PHP-5.3

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

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 97fc6d6..05a80eb 100644
--- a/NEWS
+++ b/NEWS
@@ -13,7 +13,10 @@ PHP                                                          
              NEWS
     (r.hampartsum...@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 6b3ba3b..4035b2b 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);
 }
 /* }}} */


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

Reply via email to