[PHP-CVS] cvs: php-src /ext/date php_date.c

[Rasmus Lerdorf]

rasmus          Thu May 11 03:49:13 2006 UTC

  Modified files:              
    /php-src/ext/date   php_date.c 
  Log:
  MFB
  
  
http://cvs.php.net/viewcvs.cgi/php-src/ext/date/php_date.c?r1=1.91&r2=1.92&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.91 php-src/ext/date/php_date.c:1.92
--- php-src/ext/date/php_date.c:1.91    Sun Apr  9 12:58:29 2006
+++ php-src/ext/date/php_date.c Thu May 11 03:49:12 2006
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_date.c,v 1.91 2006/04/09 12:58:29 derick Exp $ */
+/* $Id: php_date.c,v 1.92 2006/05/11 03:49:12 rasmus Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -1417,7 +1417,7 @@
 
 #ifdef EXPERIMENTAL_DATE_SUPPORT
 /* Advanced Interface */
-static zval * date_instanciate(zend_class_entry *pce, zval *object TSRMLS_DC)
+static zval * date_instantiate(zend_class_entry *pce, zval *object TSRMLS_DC)
 {
        if (!object) {
                ALLOC_ZVAL(object);
@@ -1443,7 +1443,7 @@
                RETURN_FALSE;
        }
 
-       date_instanciate(date_ce_date, return_value TSRMLS_CC);
+       date_instantiate(date_ce_date, return_value TSRMLS_CC);
        dateobj = (php_date_obj *) zend_object_store_get_object(return_value 
TSRMLS_CC);
        dateobj->time = timelib_strtotime(time_str_len ? time_str : "now", 
time_str_len ? time_str_len : sizeof("now") -1, NULL, DATE_TIMEZONEDB);
 
@@ -1652,7 +1652,7 @@
        }
        dateobj = (php_date_obj *) zend_object_store_get_object(object 
TSRMLS_CC);
        if (dateobj->time->is_localtime && dateobj->time->tz_info) {
-               date_instanciate(date_ce_timezone, return_value TSRMLS_CC);
+               date_instantiate(date_ce_timezone, return_value TSRMLS_CC);
                tzobj = (php_timezone_obj *) 
zend_object_store_get_object(return_value TSRMLS_CC);
                tzobj->tz = timelib_tzinfo_clone(dateobj->time->tz_info);
        } else {
@@ -1776,7 +1776,7 @@
        }
        /* If we find it we instantiate the object otherwise, well, we don't 
and return false */
        if (tzi) {
-               date_instanciate(date_ce_timezone, return_value TSRMLS_CC);
+               date_instantiate(date_ce_timezone, return_value TSRMLS_CC);
                tzobj = (php_timezone_obj *) 
zend_object_store_get_object(return_value TSRMLS_CC);
                tzobj->tz = tzi;
        } else {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php