Skip to content

Commit 20c72e1

Browse files
committed
Revert "Merge branch 'PHP-8.3'"
This reverts commit 5455c3f, reversing changes made to ec8e86b.
1 parent f420ea8 commit 20c72e1

File tree

2 files changed

+2
-17
lines changed

2 files changed

+2
-17
lines changed

ext/intl/dateformat/dateformat_create.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ static zend_result datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS, zend_error_handlin
112112
}
113113
locale = Locale::createFromName(locale_str);
114114
/* get*Name accessors being set does not preclude being bogus */
115-
if (locale.isBogus() || ((locale_len == 1 && locale_str[0] != 'C') && strlen(locale.getISO3Language()) == 0)) {
116-
zend_argument_value_error(1, "\"%s\" is invalid", locale_str);
115+
if (locale.isBogus() || strlen(locale.getISO3Language()) == 0) {
116+
zend_argument_value_error(1, "\"%s\" is invalid", locale_str);
117117
return FAILURE;
118118
}
119119

ext/intl/tests/gh12943.phpt

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

0 commit comments

Comments
 (0)