Skip to content

Commit 888bec1

Browse files
authored
Merge duplicate identical conditions in PDO (#7638)
1 parent 8b561d3 commit 888bec1

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

ext/pdo/pdo_stmt.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -1377,9 +1377,9 @@ PHP_METHOD(PDOStatement, fetchAll)
13771377
}
13781378

13791379
if (!error) {
1380-
if ((how & PDO_FETCH_GROUP)) {
1381-
while (do_fetch(stmt, &data, how | flags, PDO_FETCH_ORI_NEXT, /* offset */ 0, return_all));
1382-
} else if (how == PDO_FETCH_KEY_PAIR || (how == PDO_FETCH_USE_DEFAULT && stmt->default_fetch_type == PDO_FETCH_KEY_PAIR)) {
1380+
if ((how & PDO_FETCH_GROUP) || how == PDO_FETCH_KEY_PAIR ||
1381+
(how == PDO_FETCH_USE_DEFAULT && stmt->default_fetch_type == PDO_FETCH_KEY_PAIR)
1382+
) {
13831383
while (do_fetch(stmt, &data, how | flags, PDO_FETCH_ORI_NEXT, /* offset */ 0, return_all));
13841384
} else {
13851385
array_init(return_value);

0 commit comments

Comments
 (0)