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

laruence · laruence · commit cd896d69d90c · 2012-08-02T12:52:11.000+08:00
diff --git 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
@@ -694,7 +694,7 @@ static PHP_METHOD(PDO, inTransaction)
 	}
 	PDO_CONSTRUCT_CHECK;
 
-	RETURN_LONG(dbh->in_txn);
+	RETURN_BOOL(dbh->in_txn);
 }
 /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -694,7 +694,7 @@ static PHP_METHOD(PDO, inTransaction)`
`694`	`694`	`}`
`695`	`695`	`PDO_CONSTRUCT_CHECK;`
`696`	`696`
`697`		`- RETURN_LONG(dbh->in_txn);`
	`697`	`+ RETURN_BOOL(dbh->in_txn);`
`698`	`698`	`}`
`699`	`699`	`/* }}} */`
`700`	`700`