Fixed merge due to changed return type in API

derickr · derickr · commit 33fd554a3355 · 2022-05-27T16:51:44.000+01:00
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
@@ -3490,7 +3490,7 @@ static bool timezone_initialize(php_timezone_obj *tzobj, const char *tz, size_t
 		php_error_docref(NULL, E_WARNING, "Unknown or bad timezone (%s)", orig_tz);
 		timelib_free(dummy_t->tz_abbr);
 		efree(dummy_t);
-		return FAILURE;
+		return false;
 	}
 	if (not_found) {
 		php_error_docref(NULL, E_WARNING, "Unknown or bad timezone (%s)", orig_tz);

Original file line number	Diff line number	Diff line change
`@@ -3490,7 +3490,7 @@ static bool timezone_initialize(php_timezone_obj tzobj, const char tz, size_t`
`3490`	`3490`	`php_error_docref(NULL, E_WARNING, "Unknown or bad timezone (%s)", orig_tz);`
`3491`	`3491`	`timelib_free(dummy_t->tz_abbr);`
`3492`	`3492`	`efree(dummy_t);`
`3493`		`- return FAILURE;`
	`3493`	`+ return false;`
`3494`	`3494`	`}`
`3495`	`3495`	`if (not_found) {`
`3496`	`3496`	`php_error_docref(NULL, E_WARNING, "Unknown or bad timezone (%s)", orig_tz);`