From c4062ddb3b54905bddb40f78d26b40210f466eb4 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 12 May 2020 21:49:12 +0000 Subject: [PATCH] Removed "insert" parameter --- src/Model/Item.php | 12 +++++------- src/Protocol/DFRN.php | 2 +- src/Protocol/Feed.php | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/Model/Item.php b/src/Model/Item.php index 78dd6aff23..e2ea9eb816 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -36,13 +36,11 @@ use Friendica\Model\Post\Category; use Friendica\Protocol\Activity; use Friendica\Protocol\ActivityPub; use Friendica\Protocol\Diaspora; -use Friendica\Protocol\OStatus; use Friendica\Util\DateTimeFormat; use Friendica\Util\Map; use Friendica\Util\Network; use Friendica\Util\Security; use Friendica\Util\Strings; -use Friendica\Util\XML; use Friendica\Worker\Delivery; use Text_LanguageDetect; use Friendica\Repository\PermissionSet as RepPermissionSet; @@ -1595,7 +1593,7 @@ class Item return GRAVITY_UNKNOWN; // Should not happen } - public static function insert($item, $dummy = false, $notify = false, $dontcache = false) + public static function insert($item, $notify = false, $dontcache = false) { $orig_item = $item; @@ -2277,7 +2275,7 @@ class Item } } - $distributed = self::insert($item, false, $notify, true); + $distributed = self::insert($item, $notify, true); if (!$distributed) { Logger::log("Distributed public item " . $itemid . " for user " . $uid . " wasn't stored", Logger::DEBUG); @@ -2344,7 +2342,7 @@ class Item $item['contact-id'] = $item['author-id']; } - $public_shadow = self::insert($item, false, false, true); + $public_shadow = self::insert($item, false, true); Logger::log("Stored public shadow for thread ".$itemid." under id ".$public_shadow, Logger::DEBUG); } @@ -2402,7 +2400,7 @@ class Item unset($item['inform']); $item['contact-id'] = Contact::getIdForURL($item['author-link']); - $public_shadow = self::insert($item, false, false, true); + $public_shadow = self::insert($item, false, true); Logger::log("Stored public shadow for comment ".$item['uri']." under id ".$public_shadow, Logger::DEBUG); @@ -2788,7 +2786,7 @@ class Item if ($contact['network'] != Protocol::FEED) { // Store the original post - $result = self::insert($datarray2, false, false); + $result = self::insert($datarray2); Logger::log('remote-self post original item - Contact '.$contact['url'].' return '.$result.' Item '.print_r($datarray2, true), Logger::DEBUG); } else { $datarray["app"] = "Feed"; diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index fbcaf8d4b5..08ce162716 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -2584,7 +2584,7 @@ class DFRN // Turn this into a wall post. $notify = Item::isRemoteSelf($importer, $item); - $posted_id = Item::insert($item, false, $notify); + $posted_id = Item::insert($item, $notify); if ($notify) { $posted_id = $notify; diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php index baf439dc02..35e2cd5778 100644 --- a/src/Protocol/Feed.php +++ b/src/Protocol/Feed.php @@ -511,7 +511,7 @@ class Feed { $notify = PRIORITY_MEDIUM; } - $id = Item::insert($item, false, $notify); + $id = Item::insert($item, $notify); Logger::info("Feed for contact " . $contact["url"] . " stored under id " . $id);