diff options
| author | fabrixxm <fabrix.xm@gmail.com> | 2011-02-01 07:18:23 +0100 |
|---|---|---|
| committer | fabrixxm <fabrix.xm@gmail.com> | 2011-02-01 07:18:23 +0100 |
| commit | 0bec0fc5fb5bfb02a80c6a84581d9daeb9f17813 (patch) | |
| tree | 26afc64e0e9f7b1b240798bc457d4aa3c5fe5614 /include/items.php | |
| parent | e7d87e4ab3086b7cc10e92bfee769179f80a4d0d (diff) | |
| parent | 7dbdf8e6faf082e962772b76511f0fd24b6227cc (diff) | |
| download | volse-hubzilla-0bec0fc5fb5bfb02a80c6a84581d9daeb9f17813.tar.gz volse-hubzilla-0bec0fc5fb5bfb02a80c6a84581d9daeb9f17813.tar.bz2 volse-hubzilla-0bec0fc5fb5bfb02a80c6a84581d9daeb9f17813.zip | |
Merge branch 'friendika-master'
Diffstat (limited to 'include/items.php')
| -rw-r--r-- | include/items.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/items.php b/include/items.php index e238280fc..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); @@ -903,6 +906,10 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0) { $feed->enable_order_by_date(false); $feed->init(); + if($feed->error()) + logger('consume_feed: Error parsing XML: ' . $feed->error()); + + // Check at the feed level for updated contact name and/or photo $name_updated = ''; |