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/documentfragment.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/documentfragment.c')
| -rw-r--r-- | ext/dom/documentfragment.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/dom/documentfragment.c b/ext/dom/documentfragment.c index a7264ec96f..28c996abc7 100644 --- a/ext/dom/documentfragment.c +++ b/ext/dom/documentfragment.c @@ -37,10 +37,10 @@ ZEND_END_ARG_INFO(); /* }}} */ /* -* class DOMDocumentFragment extends DOMNode +* class DOMDocumentFragment extends DOMNode * * URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-B63ED1A3 -* Since: +* Since: */ const zend_function_entry php_dom_documentfragment_class_functions[] = { @@ -142,7 +142,7 @@ PHP_METHOD(domdocumentfragment, appendXML) { if (err != 0) { RETURN_FALSE; } - /* Following needed due to bug in libxml2 <= 2.6.14 + /* Following needed due to bug in libxml2 <= 2.6.14 ifdef after next libxml release as bug is fixed in their cvs */ php_dom_xmlSetTreeDoc(lst, nodep->doc); /* End stupid hack */ |