X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fitems.php;h=2230c93c77209a3d87460895c4b61be9bacca760;hb=18672675133a8164ab193ad08adc36751a734c77;hp=91165344af8602540ee5d86bcfa7e0db8f362f23;hpb=30a4b0eafb8c1947852c7a44f1c417481e9c49d3;p=friendica.git diff --git a/include/items.php b/include/items.php index 91165344af..2230c93c77 100644 --- a/include/items.php +++ b/include/items.php @@ -3,9 +3,7 @@ * @file include/items.php */ -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 +72,7 @@ function add_page_info_data(array $data, $no_photos = false) $preview = str_replace(["[", "]"], ["[", "]"], 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 { @@ -347,7 +345,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 +377,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 +429,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 }