Merge pull request #11452 from atjn/manifest-icons

[friendica.git] / src / Model / Item.php

diff --git a/src/Model/Item.php b/src/Model/Item.php
index d040c876de6df1ab4a1ee614102173943bfbc66a..34f7e0d8b8959e61e80d4d99def20eb1461e5a23 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -869,7 +869,7 @@ class Item
                $item["contact-id"] = self::contactId($item);
 
                if (!empty($item['direction']) && in_array($item['direction'], [Conversation::PUSH, Conversation::RELAY]) &&
-                       self::isTooOld($item)) {
+                       empty($item['origin']) &&self::isTooOld($item)) {
                        Logger::info('Item is too old', ['item' => $item]);
                        return 0;
                }
@@ -1751,7 +1751,7 @@ class Item
                // which point it will be automatically available through `getAvailableLanguages()` and this should be removed.
                $availableLanguages['fa'] = 'fa';
 
-               $ld = new Language($availableLanguages);
+               $ld = new Language(array_keys($availableLanguages));
                $languages = $ld->detect($naked_body)->limit(0, 3)->close();
                if (is_array($languages)) {
                        return json_encode($languages);