From: Derick Rethans <derick@php.net>
Date: Wed, 3 Jan 2007 14:46:52 +0000 (+0000)
Subject: - MFB: Fixed bug #40012 (php_date.c doesnt compile on Netware).
X-Git-Tag: RELEASE_1_0_0RC1~420
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=44327b0af2ec60bee088a046a352c724814579d7;p=php

- MFB: Fixed bug #40012 (php_date.c doesnt compile on Netware).
---

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 4b90bbf1cf..28c25052a9 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -628,6 +628,14 @@ php_win_std_time:
 		}
 		return tzid;
 	}
+#elif defined(NETWARE)
+	/* Try to guess timezone from system information */
+	{
+		char *tzid = timelib_timezone_id_from_abbr("", ((_timezone * -1) + (daylightOffset * daylightOnOff)), daylightOnOff);
+		if (tzid) {
+			return tzid;
+		}
+	}
 #endif
 	/* Fallback to UTC */
 	php_error_docref(NULL TSRMLS_CC, E_WARNING, DATE_TZ_ERRMSG "We had to select 'UTC' because your platform doesn't provide functionality for the guessing algorithm");
@@ -2218,7 +2226,7 @@ PHP_FUNCTION(timezone_name_get)
 PHP_FUNCTION(timezone_name_from_abbr)
 {
 	char    *abbr;
-	char    *tzname;
+	char    *tzid;
 	int      abbr_len;
 	long     gmtoffset = -1;
 	long     isdst = -1;
@@ -2226,10 +2234,10 @@ PHP_FUNCTION(timezone_name_from_abbr)
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ll", &abbr, &abbr_len, &gmtoffset, &isdst) == FAILURE) {
 		RETURN_FALSE;
 	}
-	tzname = timelib_timezone_id_from_abbr(abbr, gmtoffset, isdst);
+	tzid = timelib_timezone_id_from_abbr(abbr, gmtoffset, isdst);
 
-	if (tzname) {
-		RETURN_STRING(tzname, 1);
+	if (tzid) {
+		RETURN_STRING(tzid, 1);
 	} else {
 		RETURN_FALSE;
 	}