cvs: php-src /ext/pdo pdo_stmt.c
| From: | Ilia Alshanetsky | Date: | Mon, 14 Jan 2008 18:41:48 +0000 |
| Subject: | cvs: php-src /ext/pdo pdo_stmt.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-47834@lists.php.net to get a copy of this message | ||
iliaa Mon Jan 14 18:41:48 2008 UTC
Modified files:
/php-src/ext/pdo pdo_stmt.c
Log:
MFB: Missing patch bit from the FETCH_GROUP fix
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.184&r2=1.185&diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.184 php-src/ext/pdo/pdo_stmt.c:1.185
--- php-src/ext/pdo/pdo_stmt.c:1.184 Fri Jan 11 01:48:19 2008
+++ php-src/ext/pdo/pdo_stmt.c Mon Jan 14 18:41:48 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_stmt.c,v 1.184 2008/01/11 01:48:19 iliaa Exp $ */
+/* $Id: pdo_stmt.c,v 1.185 2008/01/14 18:41:48 iliaa Exp $ */
/* The PDO Statement Handle Class */
@@ -926,6 +926,8 @@
if (colno >= 0 && colno < stmt->column_count) {
if (flags == PDO_FETCH_GROUP && stmt->fetch.column == -1) {
fetch_value(stmt, return_value, 1, NULL TSRMLS_CC);
+ } else if (flags == PDO_FETCH_GROUP && colno) {
+ fetch_value(stmt, return_value, 0, NULL TSRMLS_CC);
} else {
fetch_value(stmt, return_value, colno, NULL TSRMLS_CC);
}