From: Ilia Alshanetsky <iliaa@php.net>
Date: Tue, 29 Nov 2005 23:10:48 +0000 (+0000)
Subject: MFB51: fixed zts build
X-Git-Tag: RELEASE_2_0_2~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2852ace3ef687a57ee1e38d76e5c09e54aa6a426;p=php

MFB51: fixed zts build
---

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 7b4f672463..73d9c0c884 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -34,6 +34,7 @@
 function_entry date_functions[] = {
 	PHP_FE(strtotime, NULL)
 	PHP_FE(date, NULL)
+	PHP_FE(idate, NULL)
 	PHP_FE(gmdate, NULL)
 	PHP_FE(mktime, NULL)
 	PHP_FE(gmmktime, NULL)
@@ -793,9 +794,6 @@ PHPAPI int php_idate(char format, time_t ts, int localtime)
 		case 'Z': retval = (int) (!localtime ? offset->offset : 0); break;
 
 		case 'U': retval = (int) t->sse; break;
-		default:
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unrecognized date format token.");
-			break;
 	}
 
 	if (!localtime) {
@@ -830,6 +828,7 @@ PHP_FUNCTION(idate)
 	char   *format;
 	int     format_len;
 	time_t  ts;
+	int ret; 
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &format, &format_len, &ts) == FAILURE) {
 		RETURN_FALSE;
@@ -844,7 +843,12 @@ PHP_FUNCTION(idate)
 		ts = time(NULL);
 	}
 
-	RETURN_LONG(php_idate(format[0], ts, 0));
+	ret = php_idate(format[0], ts, 0);
+	if (ret == -1) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unrecognized date format token.");
+		RETURN_FALSE;
+	}
+	RETURN_LONG(ret);
 }
 /* }}} */
 
diff --git a/ext/date/php_date.h b/ext/date/php_date.h
index d9d44027b6..2fd7c68eb6 100644
--- a/ext/date/php_date.h
+++ b/ext/date/php_date.h
@@ -28,6 +28,7 @@ extern zend_module_entry date_module_entry;
 #define phpext_date_ptr &date_module_entry
 
 PHP_FUNCTION(date);
+PHP_FUNCTION(idate);
 PHP_FUNCTION(gmdate);
 PHP_FUNCTION(strtotime);