clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/items.php
View File

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

5
src/Network/Probe.php
View File

@ -16,6 +16,7 @@ use Friendica\Core\Config;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Profile; use Friendica\Model\Profile;
use Friendica\Protocol\Email; use Friendica\Protocol\Email;
use Friendica\Protocol\Feed;
use Friendica\Util\XML; use Friendica\Util\XML;
use dba; use dba;
@ -1267,7 +1268,7 @@ class Probe
return false; return false;
} }
$feed = $ret['body']; $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 (!$feed_data) {
return false; return false;
} }
@ -1451,7 +1452,7 @@ class Probe
return false; return false;
} }
$feed = $ret['body']; $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 (!$feed_data) {
if (!$probe) { if (!$probe) {

2
src/Protocol/Diaspora.php
View File

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

0
include/feed.php → src/Protocol/Feed.php
View File