diff options
| author | andrey <andrey@php.net> | 2012-07-09 17:59:42 +0300 |
|---|---|---|
| committer | andrey <andrey@php.net> | 2012-07-09 17:59:42 +0300 |
| commit | 66e1ac23c1601abb66fa78bff87453e5e37a9377 (patch) | |
| tree | 19b707c38dda43d747dd923ac05974632bcb07fc /ext/xsl/xsltprocessor.c | |
| parent | 555db7dc4ecaffdbfb4a10f4d00ddd81c0f89ef6 (diff) | |
| parent | 2032470e4113dfbf04a1ed3b12de85ffcde6f367 (diff) | |
| download | php-git-66e1ac23c1601abb66fa78bff87453e5e37a9377.tar.gz | |
Merge branch 'PHP-5.4' of ssh://git.php.net/php-src into PHP-5.4
Diffstat (limited to 'ext/xsl/xsltprocessor.c')
| -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)) { |