The Map class is now done

[friendica.git] / include / items.php

diff --git a/include/items.php b/include/items.php
index 9f3f4ab30e503b19f8f99433c085149e4d3ab7ca..275052c1fdb73deab8337c78b2b840f8168994ad 100644 (file)
--- 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';
@@ -26,7 +27,6 @@ require_once 'include/files.php';
 require_once 'include/text.php';
 require_once 'include/threads.php';
 require_once 'include/plaintext.php';
-require_once 'include/feed.php';
 require_once 'mod/share.php';
 require_once 'include/enotify.php';
 
@@ -42,7 +42,6 @@ function construct_verb($item) {
  *             The purpose of this function is to apply system message length limits to
  *             imported messages without including any embedded photos in the length
  */
-if (! function_exists('limit_body_size')) {
 function limit_body_size($body) {
 
 //     logger('limit_body_size: start', LOGGER_DEBUG);
@@ -125,7 +124,7 @@ function limit_body_size($body) {
        } else {
                return $body;
        }
-}}
+}
 
 function title_is_body($title, $body) {
 
@@ -1551,7 +1550,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;
        }