Merge pull request #8269 from MrPetovan/bug/frio-more-actions

[friendica.git] / include / items.php

diff --git a/include/items.php b/include/items.php
index d1f0ba87874ac69ea077396fd2745100dc0c343e..f4bab4b8fc9f4edc206071976a750f969d78c8f2 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -1,11 +1,25 @@
 <?php
 /**
- * @file include/items.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
@@ -74,7 +88,7 @@ function add_page_info_data(array $data, $no_photos = false)
                $preview = str_replace(["[", "]"], ["&#91;", "&#93;"], htmlentities($data["images"][0]["src"], ENT_QUOTES, 'UTF-8', false));
                // if the preview picture is larger than 500 pixels then show it in a larger mode
                // But only, if the picture isn't higher than large (To prevent huge posts)
-               if (!Config::get('system', 'always_show_preview') && ($data["images"][0]["width"] >= 500)
+               if (!DI::config()->get('system', 'always_show_preview') && ($data["images"][0]["width"] >= 500)
                        && ($data["images"][0]["width"] >= $data["images"][0]["height"])) {
                        $text .= " image='".$preview."'";
                } else {
@@ -258,7 +272,7 @@ function consume_feed($xml, array $importer, array $contact, &$hub)
 
        if ($contact['network'] === Protocol::FEED) {
                Logger::log("Consume feeds", Logger::DEBUG);
-               Feed::import($xml, $importer, $contact, $hub);
+               Feed::import($xml, $importer, $contact);
 
                return;
        }
@@ -347,7 +361,7 @@ function drop_item($id, $return = '')
        $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $id]);
 
        if (!DBA::isResult($item)) {
-               notice(L10n::t('Item not found.') . EOL);
+               notice(DI::l10n()->t('Item not found.') . EOL);
                DI::baseUrl()->redirect('network');
        }
 
@@ -379,12 +393,12 @@ function drop_item($id, $return = '')
 
                        return Renderer::replaceMacros(Renderer::getMarkupTemplate('confirm.tpl'), [
                                '$method' => 'get',
-                               '$message' => L10n::t('Do you really want to delete this item?'),
+                               '$message' => DI::l10n()->t('Do you really want to delete this item?'),
                                '$extra_inputs' => $inputs,
-                               '$confirm' => L10n::t('Yes'),
+                               '$confirm' => DI::l10n()->t('Yes'),
                                '$confirm_url' => $query['base'],
                                '$confirm_name' => 'confirmed',
-                               '$cancel' => L10n::t('Cancel'),
+                               '$cancel' => DI::l10n()->t('Cancel'),
                        ]);
                }
                // Now check how the user responded to the confirmation query
@@ -431,7 +445,7 @@ function drop_item($id, $return = '')
                        }
                }
        } else {
-               notice(L10n::t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.') . EOL);
                DI::baseUrl()->redirect('display/' . $item['guid']);
                //NOTREACHED
        }