@@ -35,9 +35,6 @@ struct _idsIterator {
3535 xmlNode * element ;
3636};
3737
38- #define DOM_LOAD_STRING 0
39- #define DOM_LOAD_FILE 1
40-
4138/*
4239* class DOMDocument extends DOMNode
4340*
@@ -794,7 +791,7 @@ PHP_METHOD(DOMDocument, importNode)
794791 if (nodep -> doc == docp ) {
795792 retnodep = nodep ;
796793 } else {
797- retnodep = dom_clone_node (nodep , docp , recursive );
794+ retnodep = dom_clone_node (nodep , docp , intern , recursive );
798795 if (!retnodep ) {
799796 RETURN_FALSE ;
800797 }
@@ -1101,8 +1098,7 @@ PHP_METHOD(DOMDocument, normalizeDocument)
11011098}
11021099/* }}} end dom_document_normalize_document */
11031100
1104- /* {{{ */
1105- PHP_METHOD (DOMDocument , __construct )
1101+ void php_dom_document_constructor (INTERNAL_FUNCTION_PARAMETERS )
11061102{
11071103 xmlDoc * docp = NULL , * olddoc ;
11081104 dom_object * intern ;
@@ -1141,6 +1137,12 @@ PHP_METHOD(DOMDocument, __construct)
11411137 }
11421138 php_libxml_increment_node_ptr ((php_libxml_node_object * )intern , (xmlNodePtr )docp , (void * )intern );
11431139}
1140+
1141+ /* {{{ */
1142+ PHP_METHOD (DOMDocument , __construct )
1143+ {
1144+ php_dom_document_constructor (INTERNAL_FUNCTION_PARAM_PASSTHRU );
1145+ }
11441146/* }}} end DOMDocument::__construct */
11451147
11461148char * _dom_get_valid_file_path (char * source , char * resolved_path , int resolved_path_len ) /* {{{ */
@@ -1310,14 +1312,15 @@ static xmlDocPtr dom_document_parser(zval *id, int mode, char *source, size_t so
13101312}
13111313/* }}} */
13121314
1313- static void dom_finish_loading_document (zval * this , zval * return_value , xmlDocPtr newdoc )
1315+ void php_dom_finish_loading_document (zval * this , zval * return_value , xmlDocPtr newdoc )
13141316{
13151317 if (!newdoc )
13161318 RETURN_FALSE ;
13171319
13181320 dom_object * intern = Z_DOMOBJ_P (this );
13191321 size_t old_modification_nr = 0 ;
13201322 if (intern != NULL ) {
1323+ bool is_html5_class = intern -> document -> is_html5_class ;
13211324 xmlDocPtr docp = (xmlDocPtr ) dom_object_get_node (intern );
13221325 dom_doc_propsptr doc_prop = NULL ;
13231326 if (docp != NULL ) {
@@ -1337,6 +1340,7 @@ static void dom_finish_loading_document(zval *this, zval *return_value, xmlDocPt
13371340 RETURN_FALSE ;
13381341 }
13391342 intern -> document -> doc_props = doc_prop ;
1343+ intern -> document -> is_html5_class = is_html5_class ;
13401344 }
13411345
13421346 php_libxml_increment_node_ptr ((php_libxml_node_object * )intern , (xmlNodePtr )newdoc , (void * )intern );
@@ -1350,8 +1354,7 @@ static void dom_finish_loading_document(zval *this, zval *return_value, xmlDocPt
13501354 RETURN_TRUE ;
13511355}
13521356
1353- /* {{{ static void dom_parse_document(INTERNAL_FUNCTION_PARAMETERS, int mode) */
1354- static void dom_parse_document (INTERNAL_FUNCTION_PARAMETERS , int mode ) {
1357+ void dom_parse_document (INTERNAL_FUNCTION_PARAMETERS , int mode , xmlDocPtr * doc_out ) {
13551358 char * source ;
13561359 size_t source_len ;
13571360 zend_long options = 0 ;
@@ -1374,17 +1377,18 @@ static void dom_parse_document(INTERNAL_FUNCTION_PARAMETERS, int mode) {
13741377 }
13751378
13761379 xmlDocPtr newdoc = dom_document_parser (ZEND_THIS , mode , source , source_len , options );
1380+ * doc_out = newdoc ;
13771381
1378- dom_finish_loading_document (ZEND_THIS , return_value , newdoc );
1382+ php_dom_finish_loading_document (ZEND_THIS , return_value , newdoc );
13791383}
1380- /* }}} end dom_parser_document */
13811384
13821385/* {{{ URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-load
13831386Since: DOM Level 3
13841387*/
13851388PHP_METHOD (DOMDocument , load )
13861389{
1387- dom_parse_document (INTERNAL_FUNCTION_PARAM_PASSTHRU , DOM_LOAD_FILE );
1390+ xmlDocPtr unused ;
1391+ dom_parse_document (INTERNAL_FUNCTION_PARAM_PASSTHRU , DOM_LOAD_FILE , & unused );
13881392}
13891393/* }}} end dom_document_load */
13901394
@@ -1393,7 +1397,8 @@ Since: DOM Level 3
13931397*/
13941398PHP_METHOD (DOMDocument , loadXML )
13951399{
1396- dom_parse_document (INTERNAL_FUNCTION_PARAM_PASSTHRU , DOM_LOAD_STRING );
1400+ xmlDocPtr unused ;
1401+ dom_parse_document (INTERNAL_FUNCTION_PARAM_PASSTHRU , DOM_LOAD_STRING , & unused );
13971402}
13981403/* }}} end dom_document_loadxml */
13991404
@@ -1915,7 +1920,7 @@ static void dom_load_html(INTERNAL_FUNCTION_PARAMETERS, int mode) /* {{{ */
19151920 xmlDocPtr newdoc = ctxt -> myDoc ;
19161921 htmlFreeParserCtxt (ctxt );
19171922
1918- dom_finish_loading_document (ZEND_THIS , return_value , newdoc );
1923+ php_dom_finish_loading_document (ZEND_THIS , return_value , newdoc );
19191924}
19201925/* }}} */
19211926
0 commit comments