diff options
| author | Friendika <info@friendika.com> | 2011-02-16 02:09:02 -0800 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-02-16 02:09:02 -0800 |
| commit | fb3bb41dc2521ce6bcf9b58fa7b0133107fb987f (patch) | |
| tree | fef523ebf22b6c6e0fa6ba4205f7ba72516e93cf /include | |
| parent | 9f020573748af28cc09cbde18e96cfc68641ce7b (diff) | |
| parent | c8116932c286f04bbaf121f75053dfde0fb7d571 (diff) | |
| download | volse-hubzilla-fb3bb41dc2521ce6bcf9b58fa7b0133107fb987f.tar.gz volse-hubzilla-fb3bb41dc2521ce6bcf9b58fa7b0133107fb987f.tar.bz2 volse-hubzilla-fb3bb41dc2521ce6bcf9b58fa7b0133107fb987f.zip | |
Merge branch 'fabrixxm-master'
Diffstat (limited to 'include')
| -rw-r--r-- | include/oembed.php | 39 |
1 files changed, 24 insertions, 15 deletions
diff --git a/include/oembed.php b/include/oembed.php index 4d6b0af16..4d2b7185e 100644 --- a/include/oembed.php +++ b/include/oembed.php @@ -79,22 +79,31 @@ function oe_get_inner_html( $node ) { * and replace it with [embed]url[/embed] */ function oembed_html2bbcode($text) { - // If it doesn't parse at all, just return the text. - $dom = @DOMDocument::loadHTML($text); - if(! $dom) + // start parser only if 'oembed' is in text + if (strpos($text, "oembed")){ + + // convert non ascii chars to html entities + $html_text = mb_convert_encoding($text, 'HTML-ENTITIES', mb_detect_encoding($text)); + + // If it doesn't parse at all, just return the text. + $dom = @DOMDocument::loadHTML($html_text); + if(! $dom) + return $text; + $xpath = new DOMXPath($dom); + $attr = "oembed"; + + $xattr = oe_build_xpath("class","oembed"); + $entries = $xpath->query("//span[$xattr]"); + + $xattr = oe_build_xpath("rel","oembed"); + foreach($entries as $e) { + $href = $xpath->evaluate("a[$xattr]/@href", $e)->item(0)->nodeValue; + if(!is_null($href)) $e->parentNode->replaceChild(new DOMText("[embed]".$href."[embed]"), $e); + } + return oe_get_inner_html( $dom->getElementsByTagName("body")->item(0) ); + } else { return $text; - $xpath = new DOMXPath($dom); - $attr = "oembed"; - - $xattr = oe_build_xpath("class","oembed"); - $entries = $xpath->query("//span[$xattr]"); - - $xattr = oe_build_xpath("rel","oembed"); - foreach($entries as $e) { - $href = $xpath->evaluate("a[$xattr]/@href", $e)->item(0)->nodeValue; - if(!is_null($href)) $e->parentNode->replaceChild(new DOMText("[embed]".$href."[embed]"), $e); - } - return oe_get_inner_html( $dom->getElementsByTagName("body")->item(0) ); + } } ?>
\ No newline at end of file |