Skip to content

Commit bd78496

Browse files
committed
Merge branch 'PHP-8.5'
* PHP-8.5: Revert "Fix phpGH-20214: PDO::FETCH_DEFAULT unexpected behavior with PDOStatement::setFetchMode (php#21434)"
2 parents 9498bc3 + 1adfed2 commit bd78496

2 files changed

Lines changed: 0 additions & 68 deletions

File tree

ext/pdo/pdo_stmt.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1628,10 +1628,6 @@ bool pdo_stmt_setup_fetch_mode(pdo_stmt_t *stmt, zend_long mode, uint32_t mode_a
16281628

16291629
flags = mode & PDO_FETCH_FLAGS;
16301630

1631-
if ((mode & ~PDO_FETCH_FLAGS) == PDO_FETCH_USE_DEFAULT) {
1632-
mode = stmt->dbh->default_fetch_type | flags;
1633-
}
1634-
16351631
if (!pdo_verify_fetch_mode(stmt->default_fetch_type, mode, mode_arg_num, false)) {
16361632
return false;
16371633
}

ext/pdo/tests/gh20214.phpt

Lines changed: 0 additions & 64 deletions
This file was deleted.

0 commit comments

Comments
 (0)