mike            Tue Aug  1 16:45:24 2006 UTC

  Modified files:              
    /php-src/ext/date   php_date.c 
  Log:
  - use library error message on time string parse failure
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/date/php_date.c?r1=1.109&r2=1.110&diff_format=u
Index: php-src/ext/date/php_date.c
diff -u php-src/ext/date/php_date.c:1.109 php-src/ext/date/php_date.c:1.110
--- php-src/ext/date/php_date.c:1.109   Tue Aug  1 15:54:45 2006
+++ php-src/ext/date/php_date.c Tue Aug  1 16:45:24 2006
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_date.c,v 1.109 2006/08/01 15:54:45 mike Exp $ */
+/* $Id: php_date.c,v 1.110 2006/08/01 16:45:24 mike Exp $ */
 
 #include "php.h"
 #include "php_streams.h"
@@ -1684,7 +1684,9 @@
        dateobj->time = timelib_strtotime(time_str_len ? time_str : "now", 
time_str_len ? time_str_len : sizeof("now") -1, &err, DATE_TIMEZONEDB);
        if (err) {
                if (err->error_count) {
-                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to 
parse time string (%s)", time_str);
+                       /* spit out the first library error message, at least */
+                       php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to 
parse time string (%s) at position %d (%c): %s", time_str,
+                                                       
err->error_messages[0].position, err->error_messages[0].character, 
err->error_messages[0].message);
                }
                timelib_error_container_dtor(err);
        }

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

Reply via email to