From: Ilia Alshanetsky <iliaa@php.net>
Date: Thu, 7 Jun 2007 23:16:04 +0000 (+0000)
Subject: Final shot at the date issue
X-Git-Tag: php-5.2.4RC1~384
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a6340d27aeff1864b65c608c605838dc73f9741e;p=php

Final shot at the date issue
---

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index a1159691d1..52986630d8 100644
--- 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) {