derick Fri Apr 13 08:34:11 2007 UTC
Modified files:
/php-src/ext/date php_date.c
/php-src/ext/date/tests date_sun_info_001.phpt
Log:
- MFB: Fixed bug #39965 (Latitude and longitude are backwards in
date_sun_info()).
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.133&r2=1.134&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.133 php-src/ext/date/php_date.c:1.134
--- php-src/ext/date/php_date.c:1.133 Mon Mar 5 14:10:05 2007
+++ php-src/ext/date/php_date.c Fri Apr 13 08:34:11 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_date.c,v 1.133 2007/03/05 14:10:05 mike Exp $ */
+/* $Id: php_date.c,v 1.134 2007/04/13 08:34:11 derick Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -2544,7 +2544,7 @@
array_init(return_value);
/* Get sun up/down and transit */
- rs = timelib_astro_rise_set_altitude(t, latitude, longitude, -35.0/60,
1, &ddummy, &ddummy, &rise, &set, &transit);
+ rs = timelib_astro_rise_set_altitude(t, longitude, latitude, -35.0/60,
1, &ddummy, &ddummy, &rise, &set, &transit);
switch (rs) {
case -1: /* always below */
add_ascii_assoc_bool(return_value, "sunrise", 0);
@@ -2564,7 +2564,7 @@
add_ascii_assoc_long(return_value, "transit", timelib_date_to_int(t2,
&dummy));
/* Get civil twilight */
- rs = timelib_astro_rise_set_altitude(t, latitude, longitude, -6.0, 0,
&ddummy, &ddummy, &rise, &set, &transit);
+ rs = timelib_astro_rise_set_altitude(t, longitude, latitude, -6.0, 0,
&ddummy, &ddummy, &rise, &set, &transit);
switch (rs) {
case -1: /* always below */
add_ascii_assoc_bool(return_value,
"civil_twilight_begin", 0);
@@ -2582,7 +2582,7 @@
}
/* Get nautical twilight */
- rs = timelib_astro_rise_set_altitude(t, latitude, longitude, -12.0, 0,
&ddummy, &ddummy, &rise, &set, &transit);
+ rs = timelib_astro_rise_set_altitude(t, longitude, latitude, -12.0, 0,
&ddummy, &ddummy, &rise, &set, &transit);
switch (rs) {
case -1: /* always below */
add_ascii_assoc_bool(return_value,
"nautical_twilight_begin", 0);
@@ -2600,7 +2600,7 @@
}
/* Get astronomical twilight */
- rs = timelib_astro_rise_set_altitude(t, latitude, longitude, -18.0, 0,
&ddummy, &ddummy, &rise, &set, &transit);
+ rs = timelib_astro_rise_set_altitude(t, longitude, latitude, -18.0, 0,
&ddummy, &ddummy, &rise, &set, &transit);
switch (rs) {
case -1: /* always below */
add_ascii_assoc_bool(return_value,
"astronomical_twilight_begin", 0);
http://cvs.php.net/viewvc.cgi/php-src/ext/date/tests/date_sun_info_001.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/date/tests/date_sun_info_001.phpt
diff -u php-src/ext/date/tests/date_sun_info_001.phpt:1.1
php-src/ext/date/tests/date_sun_info_001.phpt:1.2
--- php-src/ext/date/tests/date_sun_info_001.phpt:1.1 Fri Dec 22 13:07:26 2006
+++ php-src/ext/date/tests/date_sun_info_001.phpt Fri Apr 13 08:34:11 2007
@@ -11,22 +11,22 @@
--EXPECTF--
array(9) {
["sunrise"]=>
- int(1165899133)
+ int(1165897782)
["sunset"]=>
- int(1165934481)
+ int(1165934168)
["transit"]=>
- int(1165916807)
+ int(1165915975)
["civil_twilight_begin"]=>
- int(1165897449)
+ int(1165896176)
["civil_twilight_end"]=>
- int(1165936165)
+ int(1165935773)
["nautical_twilight_begin"]=>
- int(1165895547)
+ int(1165894353)
["nautical_twilight_end"]=>
- int(1165938067)
+ int(1165937597)
["astronomical_twilight_begin"]=>
- int(1165893693)
+ int(1165892570)
["astronomical_twilight_end"]=>
- int(1165939921)
+ int(1165939380)
}
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
