Skip to content

Commit 4ce5dcb

Browse files
committed
Fix the non-persistent case
1 parent 776cfa2 commit 4ce5dcb

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

ext/pdo/pdo_dbh.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1444,15 +1444,18 @@ bool pdo_hash_methods(pdo_dbh_object_t *dbh_obj, int kind)
14441444
}
14451445
}
14461446
if (new_name) {
1447-
zend_attribute *attr = zend_add_function_attribute(func_p,
1448-
ZSTR_KNOWN(ZEND_STR_DEPRECATED_CAPITALIZED), 2);
1447+
uint32_t flags = dbh->is_persistent ? ZEND_ATTRIBUTE_PERSISTENT : 0;
1448+
zend_attribute *attr = zend_add_attribute(
1449+
&func_p->common.attributes,
1450+
ZSTR_KNOWN(ZEND_STR_DEPRECATED_CAPITALIZED),
1451+
2, flags, 0, 0);
14491452

14501453
attr->args[0].name = ZSTR_KNOWN(ZEND_STR_SINCE);
14511454
ZVAL_STR(&attr->args[0].value, ZSTR_KNOWN(ZEND_STR_8_DOT_5));
14521455

14531456
char *message;
14541457
size_t len = zend_spprintf(&message, 0, "use %s() instead", new_name);
1455-
zend_string *message_str = zend_string_init_interned(message, len, true);
1458+
zend_string *message_str = zend_string_init(message, len, dbh->is_persistent);
14561459
efree(message);
14571460

14581461
attr->args[1].name = ZSTR_KNOWN(ZEND_STR_MESSAGE);

0 commit comments

Comments
 (0)