From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 21 Jul 2020 13:29:44 +0000 (+0200)
Subject: Fix incorrect initialization in date_sunrise()
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1d4e229ab7a171e35190d4eda7cd0b7ced0258f4;p=php

Fix incorrect initialization in date_sunrise()
---

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index e59e121dfb..46d50e2837 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -4435,7 +4435,7 @@ static void php_do_date_sunrise_sunset(INTERNAL_FUNCTION_PARAMETERS, int calc_su
 	}
 
 	if (longitude_is_null) {
-		latitude = INI_FLT("date.default_longitude");
+		longitude = INI_FLT("date.default_longitude");
 	}
 
 	if (zenith_is_null) {
diff --git a/ext/date/tests/date_sunrise_and_sunset_basic.phpt b/ext/date/tests/date_sunrise_and_sunset_basic.phpt
index b707c3ccb3..c1606578ee 100644
--- a/ext/date/tests/date_sunrise_and_sunset_basic.phpt
+++ b/ext/date/tests/date_sunrise_and_sunset_basic.phpt
@@ -17,8 +17,14 @@ echo "Basic test for date_sunrise() and date_sunset()\n";
 echo date("D M d Y") . ', sunrise time : ' . date_sunrise(time(), SUNFUNCS_RET_STRING, 38.4, -9, 90, 1) . "\n";
 echo date("D M d Y") . ', sunset time : ' . date_sunset(time(), SUNFUNCS_RET_STRING, 38.4, -9, 90, 1) . "\n";
 
+// Check that calling with just the first parameter works.
+var_dump(gettype(date_sunrise(time())));
+var_dump(gettype(date_sunset(time())));
+
 ?>
 --EXPECTF--
 Basic test for date_sunrise() and date_sunset()
 %s %s %d %d, sunrise time : %d:%d
 %s %s %d %d, sunset time : %d:%d
+string(6) "string"
+string(6) "string"