iliaa           Tue Jul 31 22:48:43 2007 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/pdo    pdo_stmt.c 
    /php-src    NEWS 
  Log:
  
  Fixed bug #41971 (PDOStatement::fetch and PDOStatement::setFetchMode causes
  unexpected behavior).
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.21&r2=1.118.2.38.2.22&diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.21 
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.22
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.21  Sun Jul 22 15:50:17 2007
+++ php-src/ext/pdo/pdo_stmt.c  Tue Jul 31 22:48:42 2007
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.21 2007/07/22 15:50:17 iliaa Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.22 2007/07/31 22:48:42 iliaa Exp $ */
 
 /* The PDO Statement Handle Class */
 
@@ -867,10 +867,10 @@
        zend_class_entry *ce = NULL, *old_ce = NULL;
        zval grp_val, *grp, **pgrp, *retval, *old_ctor_args = NULL;
 
-       how = how & ~PDO_FETCH_FLAGS;
        if (how == PDO_FETCH_USE_DEFAULT) {
                how = stmt->default_fetch_type;
        }
+       how = how & ~PDO_FETCH_FLAGS;
 
        if (!do_fetch_common(stmt, ori, offset, do_bind TSRMLS_CC)) {
                return 0;
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.868&r2=1.2027.2.547.2.869&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.868 php-src/NEWS:1.2027.2.547.2.869
--- php-src/NEWS:1.2027.2.547.2.868     Tue Jul 31 22:47:43 2007
+++ php-src/NEWS        Tue Jul 31 22:48:42 2007
@@ -90,6 +90,8 @@
 - Fixed bug #41989 (move_uploaded_file() & relative path in ZTS mode). (Tony)
 - Fixed bug #41984 (Hangs on large SoapClient requests). (Dmitry)
 - Fixed bug #41983 (Error Fetching http headers terminated by '\n'). (Dmitry)
+- Fixed bug #41971 (PDOStatement::fetch and PDOStatement::setFetchMode causes
+  unexpected behavior). (Ilia)
 - Fixed bug #41964 (strtotime returns a timestamp for non-time string of
   pattern '(A|a) .+'). (Derick)
 - Fixed bug #41961 (Ensure search for hidden private methods does not stray

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

Reply via email to