Commit:    ee6522bebf5e5b4652d01da6e6eaec4cf59051b2
Author:    Gustavo Lopes <glo...@nebm.ist.utl.pt>         Tue, 29 Jan 2013 
16:36:14 +0100
Parents:   363fd6d6fb5c962c8d1339dfaad2bd18373de36c
Branches:  PHP-5.5 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=ee6522bebf5e5b4652d01da6e6eaec4cf59051b2

Log:
Write local err on intlcal_get_time_zone() failure

Changed paths:
  M  ext/intl/calendar/calendar_methods.cpp


Diff:
diff --git a/ext/intl/calendar/calendar_methods.cpp 
b/ext/intl/calendar/calendar_methods.cpp
index f2758fd..2d33bd1 100644
--- a/ext/intl/calendar/calendar_methods.cpp
+++ b/ext/intl/calendar/calendar_methods.cpp
@@ -782,7 +782,7 @@ U_CFUNC PHP_FUNCTION(intlcal_get_time_zone)
 
        TimeZone *tz = co->ucal->getTimeZone().clone();
        if (tz == NULL) {
-               intl_error_set(NULL, U_MEMORY_ALLOCATION_ERROR,
+               intl_errors_set(CALENDAR_ERROR_P(co), U_MEMORY_ALLOCATION_ERROR,
                        "intlcal_get_time_zone: could not clone TimeZone", 0 
TSRMLS_CC);
                RETURN_FALSE;
        }


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

Reply via email to