aboutsummaryrefslogtreecommitdiffstats
path: root/include/items.php
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-01-31 15:26:02 -0800
committerFriendika <info@friendika.com>2011-01-31 15:26:02 -0800
commit082909fe1a861219c4f9159f8f8df5aea7546da9 (patch)
tree1a1ed610cb668e2cbff10e95ebec1ffed19b58f9 /include/items.php
parentfc20fb17c299100fd39e900f20c70d823baaebdf (diff)
parentbdbbfe17b0ab58a89a0673f5409d30870afd0b9d (diff)
downloadvolse-hubzilla-082909fe1a861219c4f9159f8f8df5aea7546da9.tar.gz
volse-hubzilla-082909fe1a861219c4f9159f8f8df5aea7546da9.tar.bz2
volse-hubzilla-082909fe1a861219c4f9159f8f8df5aea7546da9.zip
Merge branch 'fabrixxm-oembed'
Diffstat (limited to 'include/items.php')
-rw-r--r--include/items.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/items.php b/include/items.php
index a5991d663..f204745bb 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1,6 +1,7 @@
<?php
require_once('bbcode.php');
+require_once('oembed.php');
function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0) {
@@ -395,6 +396,8 @@ function get_atom_elements($feed,$item) {
$res['body'] = preg_replace('#<object[^>]+>.+?' . 'http://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?</object>#s',
'[youtube]$1[/youtube]', $res['body']);
+ $res['body'] = oembed_html2bbcode($res['body']);
+
$config = HTMLPurifier_Config::createDefault();
$config->set('Cache.DefinitionImpl', null);