Skip to content

Commit 37029dc

Browse files
committed
update textdomain
1 parent 07ec78c commit 37029dc

File tree

2 files changed

+11
-1
lines changed

2 files changed

+11
-1
lines changed

ext/gettext/gettext.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,11 @@ PHP_FUNCTION(textdomain)
8888
RETURN_THROWS();
8989
}
9090

91-
if (domain != NULL && ZSTR_LEN(domain) != 0 && !zend_string_equals_literal(domain, "0")) {
91+
if (domain != NULL) {
9292
PHP_GETTEXT_DOMAIN_LENGTH_CHECK(1, ZSTR_LEN(domain))
93+
}
94+
95+
if (domain != NULL && !zend_string_equals_literal(domain, "0")) {
9396
domain_name = ZSTR_VAL(domain);
9497
}
9598

ext/gettext/tests/gettext_textdomain-retval.phpt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,18 @@ bindtextdomain ("messages", "./locale");
1818
echo textdomain('test'), "\n";
1919
echo textdomain(null), "\n";
2020
echo textdomain('foo'), "\n";
21+
22+
try {
23+
textdomain('');
24+
} catch (\ValueError $e) {
25+
echo $e->getMessage();
26+
}
2127
?>
2228
--EXPECT--
2329
test
2430
test
2531
foo
32+
textdomain(): Argument #1 ($domain) cannot be empty
2633
--CREDITS--
2734
Christian Weiske, cweiske@php.net
2835
PHP Testfest Berlin 2009-05-09

0 commit comments

Comments
 (0)