The feed moved into the new location

This commit is contained in:
Michael 2017-12-13 07:02:52 +00:00
parent af6ca96e66
commit fc55a4b9c0
4 changed files with 6 additions and 4 deletions

View file

@ -17,6 +17,7 @@ use Friendica\Model\User;
use Friendica\Object\Image;
use Friendica\Protocol\DFRN;
use Friendica\Protocol\OStatus;
use Friendica\Protocol\Feed;
require_once 'include/bbcode.php';
require_once 'include/oembed.php';
@ -1550,7 +1551,7 @@ function consume_feed($xml, $importer, &$contact, &$hub, $datedir = 0, $pass = 0
if ($contact['network'] === NETWORK_FEED) {
if ($pass < 2) {
logger("Consume feeds", LOGGER_DEBUG);
feed_import($xml, $importer, $contact, $hub);
Feed::import($xml, $importer, $contact, $hub);
}
return;
}

View file

@ -16,6 +16,7 @@ use Friendica\Core\Config;
use Friendica\Database\DBM;
use Friendica\Model\Profile;
use Friendica\Protocol\Email;
use Friendica\Protocol\Feed;
use Friendica\Util\XML;
use dba;
@ -1267,7 +1268,7 @@ class Probe
return false;
}
$feed = $ret['body'];
$feed_data = feed_import($feed, $dummy1, $dummy2, $dummy3, true);
$feed_data = Feed::import($feed, $dummy1, $dummy2, $dummy3, true);
if (!$feed_data) {
return false;
}
@ -1451,7 +1452,7 @@ class Probe
return false;
}
$feed = $ret['body'];
$feed_data = feed_import($feed, $dummy1, $dummy2, $dummy3, true);
$feed_data = Feed::import($feed, $dummy1, $dummy2, $dummy3, true);
if (!$feed_data) {
if (!$probe) {

View file

@ -1,6 +1,6 @@
<?php
/**
* @file include/diaspora.php
* @file src/Protocol/diaspora.php
* @brief The implementation of the diaspora protocol
*
* The new protocol is described here: http://diaspora.github.io/diaspora_federation/index.html