Final shot at the date issue

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index a1159691d166e9f803b792acc8069759acc737f6..52986630d8f3e5834c671feb926ca1e68e74025e 100644 (file)
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -2330,10 +2330,8 @@ static void php_do_date_sunrise_sunset(INTERNAL_FUNCTION_PARAMETERS, int calc_su
        }
        N = (calc_sunset ? h_set : h_rise) + gmt_offset;
 
-       if (N > 24) {
+       if (N > 24 || N < 0) {
                N -= floor(N / 24) * 24;
-       } else if (N < 0) {
-               N = floor(N / 24) * 24 + 24;
        }
 
        switch (retformat) {