diff options
| author | Stanislav Malyshev <stas@php.net> | 2012-06-30 17:00:25 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2012-06-30 17:00:25 -0700 |
| commit | a3322f8927618a8cadbef4ae2121084b44a564d3 (patch) | |
| tree | 939a94efa58136e851e478e070daf89edaa18376 /Zend/zend_execute.c | |
| parent | eb012cf88440423ff02c46421f29a1c6e850702c (diff) | |
| parent | 896ac689c91967dec0601fa9fe048c518da52a3c (diff) | |
| download | php-git-a3322f8927618a8cadbef4ae2121084b44a564d3.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
Fixed the common misspelling of the word occurred (occured -> occurred)
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 205531fd28..fbc73258c7 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1161,7 +1161,7 @@ convert_to_array: case IS_DOUBLE: case IS_NULL: case IS_BOOL: - zend_error(E_NOTICE, "String offset cast occured"); + zend_error(E_NOTICE, "String offset cast occurred"); break; default: zend_error(E_WARNING, "Illegal offset type"); @@ -1284,7 +1284,7 @@ static void zend_fetch_dimension_address_read(temp_variable *result, zval **cont case IS_NULL: case IS_BOOL: if (type != BP_VAR_IS) { - zend_error(E_NOTICE, "String offset cast occured"); + zend_error(E_NOTICE, "String offset cast occurred"); } break; default: |