mirror of
https://github.com/php/php-src.git
synced 2024-09-22 02:17:32 +00:00
Merge duplicate identical conditions in PDO (#7638)
This commit is contained in:
parent
8b561d33dc
commit
888bec1be3
@ -1377,9 +1377,9 @@ PHP_METHOD(PDOStatement, fetchAll)
|
||||
}
|
||||
|
||||
if (!error) {
|
||||
if ((how & PDO_FETCH_GROUP)) {
|
||||
while (do_fetch(stmt, &data, how | flags, PDO_FETCH_ORI_NEXT, /* offset */ 0, return_all));
|
||||
} else if (how == PDO_FETCH_KEY_PAIR || (how == PDO_FETCH_USE_DEFAULT && stmt->default_fetch_type == PDO_FETCH_KEY_PAIR)) {
|
||||
if ((how & PDO_FETCH_GROUP) || how == PDO_FETCH_KEY_PAIR ||
|
||||
(how == PDO_FETCH_USE_DEFAULT && stmt->default_fetch_type == PDO_FETCH_KEY_PAIR)
|
||||
) {
|
||||
while (do_fetch(stmt, &data, how | flags, PDO_FETCH_ORI_NEXT, /* offset */ 0, return_all));
|
||||
} else {
|
||||
array_init(return_value);
|
||||
|
Loading…
Reference in New Issue
Block a user