aboutsummaryrefslogtreecommitdiffstats
path: root/include/items.php
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2011-02-01 10:17:27 +0100
committerFabio Comuni <fabrix.xm@gmail.com>2011-02-01 10:17:27 +0100
commit042aa2e169310bc23398d0558455a61fe1e86a92 (patch)
tree50ae4d8845bc16e2edfbaa916e80d8709ee3fe86 /include/items.php
parent1151124feed13ebe1bf87bdcebf9692a5ce6233e (diff)
parent89313235d26569df5cbdabb1f85871f10056e41f (diff)
downloadvolse-hubzilla-042aa2e169310bc23398d0558455a61fe1e86a92.tar.gz
volse-hubzilla-042aa2e169310bc23398d0558455a61fe1e86a92.tar.bz2
volse-hubzilla-042aa2e169310bc23398d0558455a61fe1e86a92.zip
Merge remote branch 'friendika-master/master'
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);