From fc55a4b9c05123b806d30c228997397ca7897a11 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Wed, 13 Dec 2017 07:02:52 +0000
Subject: [PATCH] The feed moved into the new location

---
 include/items.php                         | 3 ++-
 src/Network/Probe.php                     | 5 +++--
 src/Protocol/Diaspora.php                 | 2 +-
 include/feed.php => src/Protocol/Feed.php | 0
 4 files changed, 6 insertions(+), 4 deletions(-)
 rename include/feed.php => src/Protocol/Feed.php (100%)

diff --git a/include/items.php b/include/items.php
index 3d03f78ca4..b028fcc38e 100644
--- a/include/items.php
+++ b/include/items.php
@@ -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;
 	}
diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 320bb43cc1..5d5a78214f 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -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) {
diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index b56f59dad6..5c6d1a2c06 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -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
diff --git a/include/feed.php b/src/Protocol/Feed.php
similarity index 100%
rename from include/feed.php
rename to src/Protocol/Feed.php