sforkowany z mirror/friendica
Improve Module\Admin\Item\Source
- Use router parameter - Accept full URLs with GUID in form - Fix 500 error when item with guid doesn't exist2022.09-rc
rodzic
e78db3fac6
commit
7d726dbb0c
|
@ -33,15 +33,7 @@ class Source extends BaseAdmin
|
||||||
{
|
{
|
||||||
parent::content($parameters);
|
parent::content($parameters);
|
||||||
|
|
||||||
$a = DI::app();
|
$guid = basename($_REQUEST['guid'] ?? '') ?: $parameters['guid'];
|
||||||
|
|
||||||
$guid = null;
|
|
||||||
// @TODO: Replace with parameter from router
|
|
||||||
if (!empty($a->argv[3])) {
|
|
||||||
$guid = $a->argv[3];
|
|
||||||
}
|
|
||||||
|
|
||||||
$guid = $_REQUEST['guid'] ?? $guid;
|
|
||||||
|
|
||||||
$source = '';
|
$source = '';
|
||||||
$item_uri = '';
|
$item_uri = '';
|
||||||
|
@ -50,12 +42,14 @@ class Source extends BaseAdmin
|
||||||
if (!empty($guid)) {
|
if (!empty($guid)) {
|
||||||
$item = Model\Item::selectFirst(['id', 'uri-id', 'guid', 'uri'], ['guid' => $guid]);
|
$item = Model\Item::selectFirst(['id', 'uri-id', 'guid', 'uri'], ['guid' => $guid]);
|
||||||
|
|
||||||
$conversation = Model\Conversation::getByItemUri($item['uri']);
|
if ($item) {
|
||||||
|
$conversation = Model\Conversation::getByItemUri($item['uri']);
|
||||||
|
|
||||||
$item_id = $item['id'];
|
$item_id = $item['id'];
|
||||||
$item_uri = $item['uri'];
|
$item_uri = $item['uri'];
|
||||||
$source = $conversation['source'];
|
$source = $conversation['source'];
|
||||||
$terms = Model\Tag::getByURIId($item['uri-id'], [Model\Tag::HASHTAG, Model\Tag::MENTION, Model\Tag::IMPLICIT_MENTION]);
|
$terms = Model\Tag::getByURIId($item['uri-id'], [Model\Tag::HASHTAG, Model\Tag::MENTION, Model\Tag::IMPLICIT_MENTION]);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$tpl = Renderer::getMarkupTemplate('admin/item/source.tpl');
|
$tpl = Renderer::getMarkupTemplate('admin/item/source.tpl');
|
||||||
|
|
Ładowanie…
Reference in New Issue