diff --git a/modules/filter/filter.module b/modules/filter/filter.module index 9e14812..cfc7c8c 100644 --- a/modules/filter/filter.module +++ b/modules/filter/filter.module @@ -1028,91 +1028,19 @@ function _filter_tips($format_id, $long = FALSE) { } /** - * Parses an HTML snippet and returns it as a DOM object. - * - * This function loads the body part of a partial (X)HTML document - * and returns a full DOMDocument object that represents this document. - * You can use filter_dom_serialize() to serialize this DOMDocument - * back to a XHTML snippet. + * Parses an HTML snippet and returns it as a SimpleXML object. * * @param $text * The partial (X)HTML snippet to load. Invalid mark-up * will be corrected on import. * @return - * A DOMDocument that represents the loaded (X)HTML snippet. + * A SimpleXML object that represents the loaded (X)HTML snippet. */ function filter_dom_load($text) { $dom_document = new DOMDocument(); // Ignore warnings during HTML soup loading. - @$dom_document->loadHTML('' . $text . ''); - - return $dom_document; -} - -/** - * Converts a DOM object back to an HTML snippet. - * - * The function serializes the body part of a DOMDocument - * back to an XHTML snippet. - * - * The resulting XHTML snippet will be properly formatted - * to be compatible with HTML user agents. - * - * @param $dom_document - * A DOMDocument object to serialize, only the tags below - * the first node will be converted. - * @return - * A valid (X)HTML snippet, as a string. - */ -function filter_dom_serialize($dom_document) { - $body_node = $dom_document->getElementsByTagName('body')->item(0); - $body_content = ''; - - foreach ($body_node->getElementsByTagName('script') as $node) { - filter_dom_serialize_escape_cdata_element($dom_document, $node); - } - - foreach ($body_node->getElementsByTagName('style') as $node) { - filter_dom_serialize_escape_cdata_element($dom_document, $node, '/*', '*/'); - } - - foreach ($body_node->childNodes as $child_node) { - $body_content .= $dom_document->saveXML($child_node); - } - return preg_replace('|<([^> ]*)/>|i', '<$1 />', $body_content); -} - -/** - * Adds comments around the childNodes as $node) { - if (get_class($node) == 'DOMCdataSection') { - // See drupal_get_js(). This code is more or less duplicated there. - $embed_prefix = "\n{$comment_end}\n"; - $fragment = $dom_document->createDocumentFragment(); - $fragment->appendXML($embed_prefix . $node->data . $embed_suffix); - $dom_element->appendChild($fragment); - $dom_element->removeChild($node); - } - } + @$dom_document->loadHTML($text); + return simplexml_load_load($dom_document); } /** @@ -1582,7 +1510,7 @@ function _filter_url_tips($filter, $format, $long = FALSE) { * Scan input and make sure that all HTML tags are properly closed and nested. */ function _filter_htmlcorrector($text) { - return filter_dom_serialize(filter_dom_load($text)); + return filter_html_simplexml()->asXml(); } /**