diff options
| author | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2015-01-12 09:02:17 +0000 |
| commit | b3823f5cab4e405b767cd8dddebb54b1c29bd2a8 (patch) | |
| tree | e42fbf615d62213c1e744b8a909155e8f2cdaa87 /ext/dom/domerrorhandler.c | |
| parent | e6fb493e5dbafdad37ba5334c986636342b5d9aa (diff) | |
| parent | 31817447cc06093368f022086340ad3f6f616528 (diff) | |
| download | php-git-b3823f5cab4e405b767cd8dddebb54b1c29bd2a8.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/json.c
ext/json/utf8_decode.c
Diffstat (limited to 'ext/dom/domerrorhandler.c')
| -rw-r--r-- | ext/dom/domerrorhandler.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/dom/domerrorhandler.c b/ext/dom/domerrorhandler.c index af73819ee1..9dfb01deba 100644 --- a/ext/dom/domerrorhandler.c +++ b/ext/dom/domerrorhandler.c @@ -34,7 +34,7 @@ ZEND_END_ARG_INFO(); /* }}} */ /* -* class domerrorhandler +* class domerrorhandler * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ERROR-Interfaces-DOMErrorHandler * Since: DOM Level 3 @@ -49,7 +49,7 @@ const zend_function_entry php_dom_domerrorhandler_class_functions[] = { /* {{{ proto dom_boolean dom_domerrorhandler_handle_error(domerror error); URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-ERRORS-DOMErrorHandler-handleError -Since: +Since: */ PHP_FUNCTION(dom_domerrorhandler_handle_error) { |