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 /ext/xsl | |
| 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 'ext/xsl')
| -rw-r--r-- | ext/xsl/xsltprocessor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/xsl/xsltprocessor.c b/ext/xsl/xsltprocessor.c index d48e7090ae..5aa6aa943b 100644 --- a/ext/xsl/xsltprocessor.c +++ b/ext/xsl/xsltprocessor.c @@ -336,7 +336,7 @@ static void xsl_ext_function_php(xmlXPathParserContextPtr ctxt, int nargs, int t php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to call handler %s()", Z_STRVAL_P(&handler)); valuePush(ctxt, xmlXPathNewString("")); } - /* retval is == NULL, when an exception occured, don't report anything, because PHP itself will handle that */ + /* retval is == NULL, when an exception occurred, don't report anything, because PHP itself will handle that */ } else if (retval == NULL) { } else { if (retval->type == IS_OBJECT && instanceof_function( Z_OBJCE_P(retval), dom_node_class_entry TSRMLS_CC)) { |