diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2015-03-30 12:14:43 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2015-03-30 12:14:43 +0300 |
| commit | 9155a267adeeb6f442f97892de441e4b6666ce73 (patch) | |
| tree | 7d525ab7379401c38b4416886655b4753ec5701a /ext/intl/intl_data.h | |
| parent | c71c97e101f239d487c7a9797bdf193098d469ca (diff) | |
| parent | 910a3243063f0490a60e5c3c0e1467a6171f4e39 (diff) | |
| download | php-git-9155a267adeeb6f442f97892de441e4b6666ce73.tar.gz | |
Merge branch 'InternalClassClean' of github.com:Danack/php-src into InternalClassClean
* 'InternalClassClean' of github.com:Danack/php-src:
Fixed indentation. Fixed comment style. Fixed commented out code.
Reverted change to function name and added note of why it is different from the class it is actually changing.
Made UConverter throw an exception if the constructor fails.
Fixed PDO constructor to not return null.
Fixed fileinfo behaviour.
Made Phar throw exception on bad constructor.
Converted intl extension to use IntlException in constructors.
Fixed SplFixedArray and tests.
Fixed ReflectionExtension and ReflectionProperty.
Fixed ReflectionFunction, ReflectionMethod and ReflectionParameter.
Fixed PDORow behaviour and message.
Diffstat (limited to 'ext/intl/intl_data.h')
| -rw-r--r-- | ext/intl/intl_data.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/intl/intl_data.h b/ext/intl/intl_data.h index 6001aa1285..c49214ffcd 100644 --- a/ext/intl/intl_data.h +++ b/ext/intl/intl_data.h @@ -64,11 +64,11 @@ typedef struct _intl_data { } /* Check status, if error - destroy value and exit */ -#define INTL_CTOR_CHECK_STATUS(obj, msg) \ +#define INTL_CTOR_CHECK_STATUS(obj, msg, forceException) \ intl_error_set_code( NULL, INTL_DATA_ERROR_CODE((obj)) ); \ if( U_FAILURE( INTL_DATA_ERROR_CODE((obj)) ) ) \ { \ - intl_errors_set_custom_msg( INTL_DATA_ERROR_P((obj)), msg, 0 ); \ + intl_errors_set_custom_msg_ex( INTL_DATA_ERROR_P((obj)), msg, 0, forceException ); \ /* yes, this is ugly, but it alreay is */ \ if (return_value != getThis()) { \ zval_dtor(return_value); \ |